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)
commit395bad7a8b5c4131304e586c51c03289a3dbeab9
treee1c9becf32e1f0b3c7d28d371adf81785c6b37fa
parenta67cb0ff5cf6670a151b7583ac078b72b7ccb836
parenta946cedfaf47d6891a8aedf0983e1df877edacd6
Merge ... '793123b8aee6579f62157a3bbd186814b632fadf'
     and 'fb519bd271114f10438a7eb00519a410dfecab92'