# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1240853745 -3600
# Node ID c04db4a88523f1765d08e5f3f865ce2841acbb54
# Parent  37a22db17285d42c57a0b1f69f25f5b6cc4f4e34# Parent  db71342ad29db1a355a296d1a38b1e494fff8b15
Merge with stable

diff -r 37a22db17285 -r c04db4a88523 hgkw/keyword.py
--- a/hgkw/keyword.py	Sun Apr 26 15:04:03 2009 +0100
+++ b/hgkw/keyword.py	Mon Apr 27 18:35:45 2009 +0100
@@ -379,7 +379,7 @@
     kwt = kwtools['templater']
     status = _status(ui, repo, kwt, opts.get('untracked'), *pats, **opts)
     modified, added, removed, deleted, unknown, ignored, clean = status
-    files = util.sort(modified + added + clean + unknown)
+    files = sorted(modified + added + clean + unknown)
     wctx = repo[None]
     kwfiles = [f for f in files if kwt.iskwfile(f, wctx.flags)]
     cwd = pats and repo.getcwd() or ''