merge of 212e6b1992b4c50e072d5f00db1d661e65552d8e
authorRichard Purdie <rpurdie@rpsys.net>
Wed, 8 Feb 2006 11:55:45 +0000 (11:55 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 8 Feb 2006 11:55:45 +0000 (11:55 +0000)
     and 93e5bd9df4fa3927a9dfb67420d1a48ab721c007


Trivial merge