Dummy merge with 3.1.
authorEzio Melotti <ezio.melotti@gmail.com>
Thu, 14 Apr 2011 03:48:34 +0000 (06:48 +0300)
committerEzio Melotti <ezio.melotti@gmail.com>
Thu, 14 Apr 2011 03:48:34 +0000 (06:48 +0300)

Trivial merge