Merge branch 'master' into d3-testing
authordeclerambaul <fabian.kaelin@gmail.com>
Tue, 24 Apr 2012 17:01:53 +0000 (13:01 -0400)
committerdeclerambaul <fabian.kaelin@gmail.com>
Tue, 24 Apr 2012 17:01:53 +0000 (13:01 -0400)

Trivial merge