merge of '25889b95fd1b6dbf67f1c12c4b431ef3b5f56abd'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Thu, 12 Apr 2007 06:00:49 +0000 (06:00 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Thu, 12 Apr 2007 06:00:49 +0000 (06:00 +0000)
commitbae26ec4702cef66ffebe94bf47941777bb06f92
treee1becda1bd7a3fcd448fa9b535b4f6a3a05ae5db
parent3ac84a62a6794dc42f45af9bc1f0c5e370cb499d
parentad05d65efd9ba1ddc25dca17e2a6a69804362a65
Merge ... '25889b95fd1b6dbf67f1c12c4b431ef3b5f56abd'
     and '605b3c5dbcbd0084c6c36225f96eea919093247a'