merge of '40f7de1bbc9465cdefd2658e7f34b24d7d121a82'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 19 Sep 2008 12:50:34 +0000 (12:50 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 19 Sep 2008 12:50:34 +0000 (12:50 +0000)
     and '5d50023ad7c56a1839a196c074ca30c9200fbd15'


Trivial merge