Merge branch 'maint'
commit68b11caa9dff723e123cc207eed69fd40e4ae1c7
authorCarsten Dominik <carsten.dominik@gmail.com>
Fri, 10 Dec 2010 13:17:34 +0000 (10 14:17 +0100)
committerCarsten Dominik <carsten.dominik@gmail.com>
Fri, 10 Dec 2010 13:17:34 +0000 (10 14:17 +0100)
treef21989f4622c08bd199a6a2e6a959a9a350a3747
parent5e7fe70e815d78ede42c5b9f5aa430f1edf4e638
parent597e2863377fb8763cf6951e3b4e777b4616300d
Merge branch 'maint'