merge of '88f5fe35a17263e7916fdae03fcab22c2fadea72'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 18 Mar 2008 08:38:49 +0000 (08:38 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 18 Mar 2008 08:38:49 +0000 (08:38 +0000)
     and 'bf587e15b3b89ef1d11762c426f618a151a0c287'


Trivial merge