#12008: merge with 3.2.
authorEzio Melotti <ezio.melotti@gmail.com>
Tue, 1 Nov 2011 12:43:51 +0000 (14:43 +0200)
committerEzio Melotti <ezio.melotti@gmail.com>
Tue, 1 Nov 2011 12:43:51 +0000 (14:43 +0200)

Trivial merge