merge of ce94922846908c2edd7362a56618ea051b244c3b
authorErik Hovland <erik@hovland.org>
Tue, 23 May 2006 16:52:34 +0000 (16:52 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 23 May 2006 16:52:34 +0000 (16:52 +0000)
     and f3d0cda096d15213040e8dd3f198a10398314030


Trivial merge