merge of '013a96e567ac3d22f9121aaae719886752b7ca5c'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 29 Feb 2008 22:54:43 +0000 (22:54 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 29 Feb 2008 22:54:43 +0000 (22:54 +0000)
     and '5b8c5c497076a23e627bf798389a7e60c4d13a8c'


Trivial merge