merge of '413b439777e0e1e5b8d6289c19d33e8f4f43dd22'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 5 Mar 2007 18:46:40 +0000 (18:46 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 5 Mar 2007 18:46:40 +0000 (18:46 +0000)
     and 'e2dbb52fe39df7ef786b6068f6178f29508dfded'


Trivial merge