Merge remote-tracking branch 'origin/master'
authordeclerambaul <fabian.kaelin@gmail.com>
Wed, 29 Feb 2012 14:45:37 +0000 (09:45 -0500)
committerdeclerambaul <fabian.kaelin@gmail.com>
Wed, 29 Feb 2012 14:45:37 +0000 (09:45 -0500)

Trivial merge