merge of '0d3b0d788fccfc1c07e0da07e8f8596c062e2ef2'
authorThomas Kunze <thommycheck@gmx.de>
Thu, 4 Sep 2008 10:17:18 +0000 (10:17 +0000)
committerThomas Kunze <thommycheck@gmx.de>
Thu, 4 Sep 2008 10:17:18 +0000 (10:17 +0000)
     and '8a4df13bdb5d6b154edb85a4b71e38ac457670a0'


Trivial merge