merge of '4daaba2f11fe05c9110da986c3686dda10ecf49d'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 17 Mar 2008 12:05:39 +0000 (12:05 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 17 Mar 2008 12:05:39 +0000 (12:05 +0000)
     and 'cc76826650730818fd451d948e3c71f69cb38c41'


Trivial merge