[meld/meld-1.6] Fix broken commit

[Kai Willadsen <kaiw src gnome org>]

commit 91598dd06278fce1df97f97f351ac642241c8c2e
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Fri Oct 12 17:13:38 2012 +1000

    Fix broken commit

 meld/dirdiff.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/meld/dirdiff.py b/meld/dirdiff.py
index 74c0bcf..88c8365 100644
--- a/meld/dirdiff.py
+++ b/meld/dirdiff.py
@@ -196,7 +196,7 @@ class CanonicalListing(object):
             for s in seq:
                 if s:
                     return s
-        filled = lambda seq: tuple([s or first(seq) for s in seq])
+        filled = lambda seq: tuple([s or first_nonempty(seq) for s in seq])
         return sorted([filled(v) for v in self.items.itervalues()])