Merge branch 'canoe' into vlock-2mastervlock-2
commita648caf87c4c25b6df742b83ae383cebe6548f6b
authorFrank Benkstein <frank-vlock@benkstein.net>
Tue, 12 May 2009 20:19:15 +0000 (12 22:19 +0200)
committerFrank Benkstein <frank-vlock@benkstein.net>
Tue, 12 May 2009 20:19:15 +0000 (12 22:19 +0200)
treee864529b73d8ecb36c97ad989e41a229988dc881
parenta95f9bb6d4be286da43464735e87c6db9f2ccbd4
parent91932bc5cac2de398cb131dc6dd5b883fa565063
Merge branch 'canoe' into vlock-2