merge of '573a418cb7f372136f03fab5334d38425e63e24c'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 21 Aug 2008 17:03:52 +0000 (17:03 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 21 Aug 2008 17:03:52 +0000 (17:03 +0000)
     and '7a04a1982f0d9de387a172985cecb7af78849dc3'


Trivial merge