Merge branch 'master' into maint
commit7bc0a9d70c41333687d1338ff65600a6d0a53305
authorCarsten Dominik <carsten.dominik@gmail.com>
Tue, 20 Jul 2010 13:48:26 +0000 (20 15:48 +0200)
committerCarsten Dominik <carsten.dominik@gmail.com>
Tue, 20 Jul 2010 13:48:26 +0000 (20 15:48 +0200)
tree6c572f8792c3453b4a60d342ccc8729a4a5a07fa
parent31c829668a7b9ec8caf81e4e6087a6328546dcb4
parent1dc3099a16af28bb8ec8db5da8037bdb5b093eda
Merge branch 'master' into maint