Merge heads.
authorEzio Melotti <ezio.melotti@gmail.com>
Wed, 20 Feb 2013 22:00:17 +0000 (00:00 +0200)
committerEzio Melotti <ezio.melotti@gmail.com>
Wed, 20 Feb 2013 22:00:17 +0000 (00:00 +0200)

Trivial merge