Merged with concurrent change
authorHenning Rogge <hrogge@googlemail.com>
Sat, 8 Aug 2009 10:50:33 +0000 (12:50 +0200)
committerHenning Rogge <hrogge@googlemail.com>
Sat, 8 Aug 2009 10:50:33 +0000 (12:50 +0200)

Trivial merge