Merge branch 'develop'
authordeclerambaul <fabian.kaelin@gmail.com>
Sun, 29 Apr 2012 22:55:49 +0000 (18:55 -0400)
committerdeclerambaul <fabian.kaelin@gmail.com>
Sun, 29 Apr 2012 22:55:49 +0000 (18:55 -0400)

Trivial merge