merge of '30b1decf31b37e6643b28149e04182c911b9a226'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 6 Mar 2008 22:48:56 +0000 (22:48 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 6 Mar 2008 22:48:56 +0000 (22:48 +0000)
     and 'eb1c40b4c0c0e45af72840032d1f8ffdf59afecc'


Trivial merge