merge of '5a77ab41b3385a039d9e0696c7d69b01aad3ad92'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 8 Sep 2008 19:34:50 +0000 (19:34 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 8 Sep 2008 19:34:50 +0000 (19:34 +0000)
     and 'a40851440ffc312af9c5719717490a99603b8d29'


Trivial merge