merge of '1415f32ae312fabcfb6f1452dbd7ce897665ca88'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 9 Oct 2008 17:36:26 +0000 (17:36 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 9 Oct 2008 17:36:26 +0000 (17:36 +0000)
     and '6a04f6b10c819319120eee8f1e058fe39a818c6f'


Trivial merge