merge of '4ec76bbee92befea1dd9e7ca17c4a7fcbcae75f0'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 6 Oct 2008 20:09:48 +0000 (20:09 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 6 Oct 2008 20:09:48 +0000 (20:09 +0000)
     and '73650456bd18d9b99cab01aab66bcde5bb6ba688'


Trivial merge