Merge branch 'maint'
authorStefano Lattarini <stefano.lattarini@gmail.com>
Sun, 18 Jul 2010 10:45:46 +0000 (12:45 +0200)
committerStefano Lattarini <stefano.lattarini@gmail.com>
Sun, 18 Jul 2010 10:45:46 +0000 (12:45 +0200)
commit1eb0eb40db233d19eeaecb1d79eed534f0740ade
tree689e92a87ee2115cf90b58bd351c3391dd3560af
parentf54a09c3ab5e8d81fb50ff66a3d333f5172f9c6e
parent36fe4f389c0a835dfcdb0f58a8909eab43189af1
Merge branch 'maint'
ChangeLog