merge of '59560bb699e5c53442482270321f0392e8772228'
authorThomas Kunze <thommycheck@gmx.de>
Mon, 4 Aug 2008 13:25:51 +0000 (13:25 +0000)
committerThomas Kunze <thommycheck@gmx.de>
Mon, 4 Aug 2008 13:25:51 +0000 (13:25 +0000)
     and 'd7ac2578b689d01a8d9b17579781f0f7a6926ebd'


Trivial merge