# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1206110282 -3600
# Node ID 432aa523282cf287ac27032b327b8aeb9abcb093
# Parent  ff5b52ea337b4757e7943f04b3820bf814a5f517# Parent  39fef460b62c0ab1bbdd56915be70f84b22a4550
Merge with stable

diff -r 39fef460b62c -r 432aa523282c .hgignore
--- a/.hgignore	Fri Mar 21 14:52:24 2008 +0100
+++ b/.hgignore	Fri Mar 21 15:38:02 2008 +0100
@@ -6,6 +6,7 @@
 *.swp
 *.orig
 *.rej
+.DS_Store
 
 build/*
 MANIFEST