Merge commit 'alioth/master'
authorFrank Lichtenheld <frank@lichtenheld.de>
Tue, 11 Dec 2007 23:16:59 +0000 (00:16 +0100)
committerFrank Lichtenheld <frank@lichtenheld.de>
Tue, 11 Dec 2007 23:16:59 +0000 (00:16 +0100)

Trivial merge