merge of 1af98528cc819da70e3ec70148b0697072cec68a
authorRichard Purdie <rpurdie@rpsys.net>
Thu, 12 Jan 2006 22:21:23 +0000 (22:21 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 12 Jan 2006 22:21:23 +0000 (22:21 +0000)
     and dbca6f4c143066fafe7af7445da627277276ea33


Trivial merge