merge of c2b2b886ea84df92ea854ebb40c0d1c1bcc8b756
authorRichard Purdie <rpurdie@rpsys.net>
Thu, 27 Apr 2006 18:58:01 +0000 (18:58 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 27 Apr 2006 18:58:01 +0000 (18:58 +0000)
     and f5cd7ec006a5ec5b566f8ee3cc2552418899e9d1


Trivial merge