Merge commit 'garage/master'
authorRiku Voipio <riku.voipio@iki.fi>
Mon, 20 Apr 2009 12:16:47 +0000 (15:16 +0300)
committerRiku Voipio <riku.voipio@iki.fi>
Mon, 20 Apr 2009 12:16:47 +0000 (15:16 +0300)

Trivial merge