merge of '32f3152ef198ae19e34181438504621d6e5c0270'
authorMichael Krelin <hacker@klever.net>
Sat, 7 Jul 2007 17:18:31 +0000 (17:18 +0000)
committerMichael Krelin <hacker@klever.net>
Sat, 7 Jul 2007 17:18:31 +0000 (17:18 +0000)
     and '7ec9615281babcb1bd33e3299ca47a3cd2e4c8f7'


Trivial merge