Axel Belinfante [Wed, 10 Apr 2013 15:08:50 +0000 (17:08 +0200)]

Trivial merge