merge of '9850af7d84c661a1d289c3b222d449301a327c1b'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 1 Jul 2008 13:39:38 +0000 (13:39 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 1 Jul 2008 13:39:38 +0000 (13:39 +0000)
     and 'f57f3813de031589228dc010765adb9b4069ba16'


Trivial merge