Merge branch 'edge' of github.com:arthurwolf/Smoothie into edge
authorArthur Wolf <wolf.arthur@gmail.com>
Wed, 20 Feb 2013 22:57:20 +0000 (23:57 +0100)
committerArthur Wolf <wolf.arthur@gmail.com>
Wed, 20 Feb 2013 22:57:20 +0000 (23:57 +0100)

Trivial merge