merge of '4743c739f8c1b375b5ca677c206266a8bd2e818f'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 11 Mar 2007 22:18:19 +0000 (22:18 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 11 Mar 2007 22:18:19 +0000 (22:18 +0000)
     and '929600dfe3a47dcc3a6fa29011a5cac24759e500'


Trivial merge