merge of 04b4b8f5f295f404ebdfa6de20dc4b245fcbc612
authorRichard Purdie <rpurdie@rpsys.net>
Tue, 9 May 2006 15:45:26 +0000 (15:45 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 9 May 2006 15:45:26 +0000 (15:45 +0000)
     and d6f338f3bfad6cdb353f6f167aa3e0d26773d655


Trivial merge