merge of '3e0e5727f7fe0745a9ac42f53da9955314c5f869'
authorThomas Kunze <thommycheck@gmx.de>
Sun, 24 Feb 2008 00:04:20 +0000 (00:04 +0000)
committerThomas Kunze <thommycheck@gmx.de>
Sun, 24 Feb 2008 00:04:20 +0000 (00:04 +0000)
     and '7ab0c406df80db3fa391ee33a803bc653763cafb'


Trivial merge