Merge commit 'garage/master' into garage-push
authorRiku Voipio <riku.voipio@iki.fi>
Fri, 22 May 2009 14:42:14 +0000 (17:42 +0300)
committerRiku Voipio <riku.voipio@iki.fi>
Fri, 22 May 2009 14:42:14 +0000 (17:42 +0300)

Trivial merge