Merge commit 'garage/master'
authorRiku Voipio <riku.voipio@iki.fi>
Tue, 10 Mar 2009 10:24:22 +0000 (12:24 +0200)
committerRiku Voipio <riku.voipio@iki.fi>
Tue, 10 Mar 2009 10:24:22 +0000 (12:24 +0200)
commit366e4fde7e7f6bc2fbb8a857a978440b9d58253f
tree30b45feaa60c1a7eb16f511509c4f196d63d8d88
parentcd60c2e1056509853450490088a96e73efe2f0f9
parentee20d0932403d979bd6d83f161c0b2ceb658b4c3
Merge commit 'garage/master'