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)
1  2 
ChangeLog

diff --cc ChangeLog
Simple merge