merge of '520adb7194d1e84d76986739599b959aaba1f352'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 13 Oct 2008 00:56:30 +0000 (00:56 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 13 Oct 2008 00:56:30 +0000 (00:56 +0000)
     and '730bf4933e7dda0fe908e13d1296d388d8a6d091'


Trivial merge