merge of '18239eb8813140e4bf4a47f026a9ff1328685d29'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 13 Feb 2008 01:49:05 +0000 (01:49 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 13 Feb 2008 01:49:05 +0000 (01:49 +0000)
     and '5322568ecee532657239a959db7be8e868de87f2'


Trivial merge