merge of '5245fa92de31b9af071626ab0aa8ee1699126429'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 19 Sep 2008 15:47:36 +0000 (15:47 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 19 Sep 2008 15:47:36 +0000 (15:47 +0000)
     and 'd589ae71d47d05c2754a75c5d7d6af2d12e8c58f'


Trivial merge