#17256: merge with 3.2.
authorEzio Melotti <ezio.melotti@gmail.com>
Fri, 22 Feb 2013 05:51:18 +0000 (07:51 +0200)
committerEzio Melotti <ezio.melotti@gmail.com>
Fri, 22 Feb 2013 05:51:18 +0000 (07:51 +0200)

Trivial merge