merge of '505353d4980790de19d2f2385c848a5402fa919a'
authorThomas Kunze <thommycheck@gmx.de>
Wed, 6 Aug 2008 00:22:48 +0000 (00:22 +0000)
committerThomas Kunze <thommycheck@gmx.de>
Wed, 6 Aug 2008 00:22:48 +0000 (00:22 +0000)
     and 'de7fa612bd9d4ae1e7ffb3f036835b8023dfa1ca'


Trivial merge