Merge branch 'master' into 0.11

This commit is contained in:
Wim Taymans 2011-05-24 18:26:06 +02:00
commit 80427df862

2
common

@ -1 +1 @@
Subproject commit 46dfcea233cf6df83e3771d8a8066e87d614f893
Subproject commit 69b981f10caa234ad0ff639179d0fda8505bd94b