merge of '6c16fb38b0e12103704f2bd628944f23673cd55e'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Sun, 15 Jul 2007 23:44:16 +0000 (23:44 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Sun, 15 Jul 2007 23:44:16 +0000 (23:44 +0000)
commitb5da5388d3816b879cb70a53d70a74ae0285087e
treea22830d7fa5a6267cceb2a40ed7da158a8cfc76e
parente99aaf7a96140262b6fb1fab34a946861f10825b
parent7b91a4c2b93b761cb651be442b013ac92956e5ba
Merge ... '6c16fb38b0e12103704f2bd628944f23673cd55e'
     and 'a90a8d2ce8fe66cb43f748e3b5dfef9416878951'