merge of '3fe173adf79372b5e29f63215a462e3f7cfdff08'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 25 May 2007 09:01:29 +0000 (09:01 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 25 May 2007 09:01:29 +0000 (09:01 +0000)
     and 'ceff31fcddbcbfcc34f98821f69f52fdce03e812'


Trivial merge