Merge branch 'edge' of github.com:arthurwolf/Smoothie into edge
authorArthur Wolf <wolf.arthur@gmail.com>
Sun, 3 Feb 2013 18:25:35 +0000 (19:25 +0100)
committerArthur Wolf <wolf.arthur@gmail.com>
Sun, 3 Feb 2013 18:25:35 +0000 (19:25 +0100)

Trivial merge