Merge remote-tracking branch 'origin/develop' into develop
authordeclerambaul <fabian.kaelin@gmail.com>
Mon, 14 May 2012 17:54:56 +0000 (13:54 -0400)
committerdeclerambaul <fabian.kaelin@gmail.com>
Mon, 14 May 2012 17:54:56 +0000 (13:54 -0400)

Trivial merge