Merge commit 'local/master'
authorJoachim Breitner <mail@joachim-breitner.de>
Fri, 26 Jun 2009 20:00:15 +0000 (22:00 +0200)
committerJoachim Breitner <mail@joachim-breitner.de>
Fri, 26 Jun 2009 20:00:15 +0000 (22:00 +0200)

Trivial merge