Merge commit 'rene/master' into vlock-2
commit49522e5493d1a13c4b5cf7090da0db6da57c71d5
authorFrank Benkstein <frank-vlock@benkstein.net>
Wed, 17 Oct 2007 09:19:55 +0000 (17 11:19 +0200)
committerFrank Benkstein <frank-vlock@benkstein.net>
Wed, 17 Oct 2007 09:19:55 +0000 (17 11:19 +0200)
treefe41c3813cdc6c384d2f6bd6cbef00b0aca610b3
parentca4015d17e01d3c26101b2f667b72c9fbcaa0bda
parentaeff5fa217016d0ba9080eef1003eaa7e803f038
Merge commit 'rene/master' into vlock-2