merge of '3b41707c8c7d8ea4e1adb918870bd216fdd78078'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 13 Mar 2008 17:37:20 +0000 (17:37 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 13 Mar 2008 17:37:20 +0000 (17:37 +0000)
     and 'b6ebdc133a282a20876e945c411c3c30af2c008b'


Trivial merge