Merge commit 'garage/master' into garage-push
authorRiku Voipio <riku.voipio@iki.fi>
Thu, 9 Apr 2009 11:59:36 +0000 (14:59 +0300)
committerRiku Voipio <riku.voipio@iki.fi>
Thu, 9 Apr 2009 11:59:36 +0000 (14:59 +0300)

Trivial merge