merge of 619c2a2f86cda6fa47d337c32bb59fd59bfd2697
authorRichard Purdie <rpurdie@rpsys.net>
Wed, 14 Jun 2006 23:57:56 +0000 (23:57 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 14 Jun 2006 23:57:56 +0000 (23:57 +0000)
     and 6c5f6dd92dc9e167c3598305801931820379802a


Trivial merge