merge of '2de318fc2a95854259cdc31038f89dae83fb0121'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 5 May 2008 19:11:03 +0000 (19:11 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 5 May 2008 19:11:03 +0000 (19:11 +0000)
     and 'f94c84daf04e33f569fffdd3b60be112b594c750'


Trivial merge