Merge commit 'alioth/master'
authorFrank Lichtenheld <frank@lichtenheld.de>
Sun, 25 Nov 2007 13:11:09 +0000 (14:11 +0100)
committerFrank Lichtenheld <frank@lichtenheld.de>
Sun, 25 Nov 2007 13:11:09 +0000 (14:11 +0100)

Trivial merge