merge of '324341178a5782c39da0f446a612274d47105e85'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 2 Apr 2007 16:12:11 +0000 (16:12 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 2 Apr 2007 16:12:11 +0000 (16:12 +0000)
     and '4182d55033155215cb92988f24e202551fc3da2a'


Trivial merge