merge of '8816a1930a80e66c19c4754fa2383feb1c08d7bc'
authorDirk Opfer <dirk@opfer-online.de>
Fri, 9 May 2008 20:09:26 +0000 (20:09 +0000)
committerDirk Opfer <dirk@opfer-online.de>
Fri, 9 May 2008 20:09:26 +0000 (20:09 +0000)
commit2998633486bf540857ebcdf0b0271751b0e1da79
treee870ecb8c9b352cf51685daa5d8d33ae62529165
parent363dc06e79fd13b277a506967b46a77ffbec8d7d
parent9424be2d1e8eb88a1feef091f2cd34d6413a6485
Merge ... '8816a1930a80e66c19c4754fa2383feb1c08d7bc'
     and 'bcb4d050472f6a21040b7de0fc55f120166ad02b'