merge of 'b44f4735776226776eff9f2c0c692f9658a207a8'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 9 May 2007 11:32:44 +0000 (11:32 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 9 May 2007 11:32:44 +0000 (11:32 +0000)
commitfb58ce1bf24695e5dcf93e1166cbda0caf0c432e
tree40698065a0ea285401282a7a2021984ae1795d66
parent3dc0fde932bf15c3c797fb67f0a489545820829f
parentda34aadce5bf8dd247dd70a43a7845d4a722f4f7
Merge ... 'b44f4735776226776eff9f2c0c692f9658a207a8'
     and 'f4394378e45366dc9b87bc34aa484175484485b2'