merge of '714d18ab0ac1f1a1eac49614202379c5e280243b'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 23 Oct 2007 19:03:39 +0000 (19:03 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 23 Oct 2007 19:03:39 +0000 (19:03 +0000)
     and 'c9981e7f0cdbc263c56a265edce6737f4b66cc40'


Trivial merge