Merge branch 'maint' into java-work
authorStefano Lattarini <stefano.lattarini@gmail.com>
Wed, 4 May 2011 20:51:47 +0000 (22:51 +0200)
committerStefano Lattarini <stefano.lattarini@gmail.com>
Wed, 4 May 2011 20:51:47 +0000 (22:51 +0200)
1  2 
ChangeLog

diff --cc ChangeLog
Simple merge