merge of 12fab859e46a5b7c800c685dd8a3595e6e74c5e7
authorRaymond Danks <raymond@edanks.com>
Thu, 1 Jun 2006 22:23:14 +0000 (22:23 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 1 Jun 2006 22:23:14 +0000 (22:23 +0000)
     and de70e38331c91d4268c0efce6bebf0cb4d762a6d


Trivial merge