merge of '470abd3e031218485cbc8e340327fcfa663ed504'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 19 Aug 2007 11:44:29 +0000 (11:44 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 19 Aug 2007 11:44:29 +0000 (11:44 +0000)
     and 'e3172af4d60e901a6bd89e3e56ad6e04471826d1'


Trivial merge