Merge branch 'maint'
authorRalf Wildenhues <Ralf.Wildenhues@gmx.de>
Sun, 2 Jan 2011 05:12:13 +0000 (06:12 +0100)
committerRalf Wildenhues <Ralf.Wildenhues@gmx.de>
Sun, 2 Jan 2011 05:12:26 +0000 (06:12 +0100)
commitb9ab6dd38be370a76db85c32e0c0ab9e7189eed6
tree47374fbf03f364725ad26c45f1ade719b9e65a29
parent48b2ab910b1f7c5ab5a86a428beafcf42b39427b
parent1247b6419fc556255952ef6eeee08da9b185a0bf
Merge branch 'maint'
ChangeLog