Merge branch 'master' of ssh://git@localhost/cl7
authorGreg Burri <greg.burri@gmail.com>
Wed, 16 Sep 2009 15:43:27 +0000 (17:43 +0200)
committerGreg Burri <greg.burri@gmail.com>
Wed, 16 Sep 2009 15:43:27 +0000 (17:43 +0200)

Trivial merge