Merge heads.
authorEzio Melotti <ezio.melotti@gmail.com>
Fri, 11 Jan 2013 07:06:12 +0000 (09:06 +0200)
committerEzio Melotti <ezio.melotti@gmail.com>
Fri, 11 Jan 2013 07:06:12 +0000 (09:06 +0200)

Trivial merge