merge of '16882b53b725e8d7bfbf2d2909cfbf1f3a8a90fc'
authorThomas Kunze <thommycheck@gmx.de>
Sun, 2 Mar 2008 19:55:55 +0000 (19:55 +0000)
committerThomas Kunze <thommycheck@gmx.de>
Sun, 2 Mar 2008 19:55:55 +0000 (19:55 +0000)
     and '55956ba3628054539f1f1f6c44ab7108d48f8b32'


Trivial merge