Merge branch 'maint'
authorStefano Lattarini <stefano.lattarini@gmail.com>
Wed, 17 Nov 2010 19:23:13 +0000 (20:23 +0100)
committerStefano Lattarini <stefano.lattarini@gmail.com>
Wed, 17 Nov 2010 19:23:13 +0000 (20:23 +0100)
1  2 
ChangeLog

diff --cc ChangeLog
Simple merge