merge of '0308024e7a88007651ed3a14db106a00b69b32a1'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 26 Jul 2008 07:36:52 +0000 (07:36 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 26 Jul 2008 07:36:52 +0000 (07:36 +0000)
     and '18c98c8c6d244da50f3f633a86903fd971aa0602'


Trivial merge