Merge branch 'canoe' into vlock-2
commita95f9bb6d4be286da43464735e87c6db9f2ccbd4
authorFrank Benkstein <frank-vlock@benkstein.net>
Tue, 12 May 2009 20:13:52 +0000 (12 22:13 +0200)
committerFrank Benkstein <frank-vlock@benkstein.net>
Tue, 12 May 2009 20:13:52 +0000 (12 22:13 +0200)
treed9988c85a6b5a398f5c34b2c02dd11d567e59f49
parent5367cd1e9eb61a639759b18cd3cb359860d77353
parent486f9068a0d739f7430ca1bd76fd9469e4b48a3f
Merge branch 'canoe' into vlock-2