Merge commit 'aad49bd260494878aed6795c7a897ad1d28c3082' alex/master origin/HEAD origin/master
authorAlexander Barton <alex@barton.de>
Tue, 13 May 2008 10:14:14 +0000 (12:14 +0200)
committerAlexander Barton <alex@barton.de>
Tue, 13 May 2008 10:14:14 +0000 (12:14 +0200)

Trivial merge