merge of '1c81f55c067f96a737e8f54d256a02f24f13f8ae'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 14 Mar 2008 11:30:22 +0000 (11:30 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 14 Mar 2008 11:30:22 +0000 (11:30 +0000)
     and '7cea498c89cd9f4506bd1ed4ce852d868e4e299f'


Trivial merge