merge of '114caf859f66364143cd179bd3ae50672f123d24'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 12 Jan 2007 09:57:22 +0000 (09:57 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 12 Jan 2007 09:57:22 +0000 (09:57 +0000)
     and '317ff5b9d6db289545e8b5bae03ac89c5d36024f'


Trivial merge