Merge
authorGiuseppe Penone <giuspen@gmail.com>
Fri, 31 Jan 2014 21:26:29 +0000 (22:26 +0100)
committerGiuseppe Penone <giuspen@gmail.com>
Fri, 31 Jan 2014 21:26:29 +0000 (22:26 +0100)

Trivial merge