Merge branch 'maint'
commit8b593cb3a7addb266f1a1ed873f6a4955949d71f
authorCarsten Dominik <carsten.dominik@gmail.com>
Wed, 21 Jul 2010 16:46:44 +0000 (21 18:46 +0200)
committerCarsten Dominik <carsten.dominik@gmail.com>
Wed, 21 Jul 2010 16:46:44 +0000 (21 18:46 +0200)
tree6a7d8725ab5b7a52cf210dcbe27522411f85b3a6
parentfe684b62c6c676d88fd3dacd2f8d03a029b85d2f
parent087a5b066c0019b97b51bc0e983b5c6450db1a1d
Merge branch 'maint'