Merge branch 'maint'
authorRalf Wildenhues <Ralf.Wildenhues@gmx.de>
Sun, 6 Jun 2010 12:47:45 +0000 (14:47 +0200)
committerRalf Wildenhues <Ralf.Wildenhues@gmx.de>
Sun, 6 Jun 2010 12:47:45 +0000 (14:47 +0200)
commit6b824c7d470c71ec0858144ac714572faa81759c
tree392d9a6ce740cc3a39a86e0d7c79667dc52a2789
parent915d00c655eb3eebc7b9ca7a0b2dfd76ccc87b2a
parentac61ca33187ca451bb01d733b472a027003e72b7
Merge branch 'maint'
ChangeLog