#14020: merge with 3.2.
authorEzio Melotti <ezio.melotti@gmail.com>
Sat, 18 Feb 2012 00:03:35 +0000 (02:03 +0200)
committerEzio Melotti <ezio.melotti@gmail.com>
Sat, 18 Feb 2012 00:03:35 +0000 (02:03 +0200)

Trivial merge