merge of '4e2ecbe3b531720352dbfdff640946f0773a6bb4'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Mon, 21 May 2007 09:09:33 +0000 (09:09 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Mon, 21 May 2007 09:09:33 +0000 (09:09 +0000)
commitd7ceaa521009aed4e6f19789bad0100f6ed2099d
tree55a577b9d548646229ab4f8837d0742fcb551b8a
parent17741798356f73b85730ef94018bd6d0834f303f
parent36b5ce9fd7ba4edc1e0647e65a6a7870533e042b
Merge ... '4e2ecbe3b531720352dbfdff640946f0773a6bb4'
     and 'c876168ea7f3cb64f08c25751c96b9565172329c'