merge of '793123b8aee6579f62157a3bbd186814b632fadf'
authorMichael Krelin <hacker@klever.net>
Fri, 22 Aug 2008 18:19:28 +0000 (18:19 +0000)
committerMichael Krelin <hacker@klever.net>
Fri, 22 Aug 2008 18:19:28 +0000 (18:19 +0000)
     and 'fb519bd271114f10438a7eb00519a410dfecab92'


Trivial merge