# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1206275696 -3600
# Node ID 15a4c3d865017de99da0408236063842e08dde21
# Parent  432aa523282cf287ac27032b327b8aeb9abcb093# Parent  688d71563c0735768265be9bc878bcded7db08a7
Merge with stable

diff -r 688d71563c07 -r 15a4c3d86501 .hgignore
--- a/.hgignore	Sat Mar 22 18:33:10 2008 +0100
+++ b/.hgignore	Sun Mar 23 13:34:56 2008 +0100
@@ -6,6 +6,7 @@
 *.swp
 *.orig
 *.rej
+.DS_Store
 
 build/*
 MANIFEST