# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1207784909 -7200
# Node ID 1c3a9f84dbbca005885fd1facc0a09487e9ecf08
# Parent  3b71ebfe45acf8cfa194160b5bd797b5f7af9a07# Parent  0c91995647e954b557b1e25ac494b95041d91585
Merge with stable

diff -r 0c91995647e9 -r 1c3a9f84dbbc .hgignore
--- a/.hgignore	Thu Apr 10 01:46:06 2008 +0200
+++ b/.hgignore	Thu Apr 10 01:48:29 2008 +0200
@@ -6,6 +6,7 @@
 *.swp
 *.orig
 *.rej
+.DS_Store
 
 build/*
 MANIFEST
diff -r 0c91995647e9 -r 1c3a9f84dbbc hgkw/keyword.py