merge of '09fce21ef9143343e04d95aa6ad19ddae5e6bc08'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Fri, 5 Jan 2007 14:36:04 +0000 (14:36 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Fri, 5 Jan 2007 14:36:04 +0000 (14:36 +0000)
commit9dd9f0a6b7935f836e8a2f82ea072dd4a8e35eeb
tree0ce446c77f1dc862acd0e739790b8fae13747057
parent820a3d00bc0e799fdb9d7f527fa8b55d4e7cc767
parent5260becf936ab3158c25537063e6e5e2a4007887
Merge ... '09fce21ef9143343e04d95aa6ad19ddae5e6bc08'
     and 'fb3e676095ae8da1e4da5e20f0a928a476c9302b'