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)
commita6f880e856ceee0bec822b41bc7c1124c0c5ded1
treef9f8fb12ee5b82dae0e994420ee72de6337f930f
parent63d7e11b96daf6d545a0c886215efc2b307efab8
parent454ca824a12d3294bb73cf568f4fbeedfac845c2
Merge commit 'alioth/master'