Merge branch 'maint'
authorRalf Wildenhues <Ralf.Wildenhues@gmx.de>
Tue, 8 Jun 2010 18:39:33 +0000 (20:39 +0200)
committerRalf Wildenhues <Ralf.Wildenhues@gmx.de>
Tue, 8 Jun 2010 18:39:33 +0000 (20:39 +0200)
commitedb600843bcf2f72fbac10c46e0a920c7e8ed334
tree8168c9c202e5f785075b1656fbd8411c669dcb92
parent6421a0c141f2b98e2aa40e2ac2f6e487869d4e86
parent716a33f9e43e13ddc8b3dee6188915b933d54091
Merge branch 'maint'
ChangeLog