Merge branch 'maint'
authorRalf Wildenhues <Ralf.Wildenhues@gmx.de>
Wed, 20 Jul 2011 21:35:32 +0000 (23:35 +0200)
committerRalf Wildenhues <Ralf.Wildenhues@gmx.de>
Wed, 20 Jul 2011 21:35:32 +0000 (23:35 +0200)
commit2b0687bb9db3b34ccb0de7bebd4769f635ae1fd1
tree6f600398bdc6cce9ba8aba4f3ab55d37cdeffe83
parent7450206489bea8b4150d564a70413c541c08596b
parent158e1d9b450600f15226eefc5b7a026478e1500b
Merge branch 'maint'
ChangeLog