merge of '406c90b8a818c97f925962469fd82f2ed13008f4'
authorThomas Kunze <thommycheck@gmx.de>
Sun, 3 Aug 2008 21:45:26 +0000 (21:45 +0000)
committerThomas Kunze <thommycheck@gmx.de>
Sun, 3 Aug 2008 21:45:26 +0000 (21:45 +0000)
     and '73fde4da3f327fd96c1de6b88bb8e733e1db530d'


Trivial merge