merge of cc68e6a6ee48e5f52c126e9c2d4263e20d33d765
authorRichard Purdie <rpurdie@rpsys.net>
Sat, 27 May 2006 09:07:35 +0000 (09:07 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 27 May 2006 09:07:35 +0000 (09:07 +0000)
     and cf975cbb341113ccf37b2caa9812aa6435b6c203


Trivial merge