merge of '4d9368570e94fc8bc65712d1c95027d8a436eee1'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 9 May 2008 01:54:26 +0000 (01:54 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 9 May 2008 01:54:26 +0000 (01:54 +0000)
     and '6f9a15eb9033fcc77c3985059f624c5623c9c90b'


Trivial merge