Merge remote-tracking branch 'origin/master'

This commit is contained in:
Jürg Lehni 2011-06-17 17:07:18 +01:00
commit 5020484402

@ -1 +1 @@
Subproject commit 4a584d77db9af5298d35101addcde1cf1bdb7d7a
Subproject commit 2ae6a23eccf3f9edf860f54b5c73fd2b705ffe2a