merge of '3985bcd7ec541c61234ed284c4d7d7ee263a3a9f'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 12 Oct 2008 01:22:36 +0000 (01:22 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 12 Oct 2008 01:22:36 +0000 (01:22 +0000)
     and 'eb9fcfc3252827f84d56edd36426fb39c72f1eed'


Trivial merge