merge of '4a9764846eca8e7a6608990c71feaab1b82bda1f'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 24 Dec 2007 01:37:18 +0000 (01:37 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 24 Dec 2007 01:37:18 +0000 (01:37 +0000)
     and '5ac15bc50757ca4ed18bce46192c87c5141b1068'


Trivial merge