merge of 61685483d439c8fa8ae72f891a69b446c143d5a7
authorRichard Purdie <rpurdie@rpsys.net>
Tue, 21 Mar 2006 00:49:29 +0000 (00:49 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 21 Mar 2006 00:49:29 +0000 (00:49 +0000)
     and b08f63739476538bba8a26df42863f10c88eb335


Trivial merge