merge of '2ad7668bebb7855b083061e891b9bee8621fd680'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 19 Oct 2007 22:44:04 +0000 (22:44 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 19 Oct 2007 22:44:04 +0000 (22:44 +0000)
     and 'c9cff32687e01bbe89891629a8ece47220af5140'


Trivial merge