merge of 880318acc987af76af9d75d11ad618c846ec19b6
authorRichard Purdie <rpurdie@rpsys.net>
Wed, 29 Mar 2006 13:42:09 +0000 (13:42 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 29 Mar 2006 13:42:09 +0000 (13:42 +0000)
     and e7ac37620f70e9c84aa128f610b17504d6c115fd


Trivial merge