merge of '0d12a42d751e597b06de72de2f533edced3f924b'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 13 Dec 2007 03:17:28 +0000 (03:17 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 13 Dec 2007 03:17:28 +0000 (03:17 +0000)
     and '9accc308ba3bc929c4110a7f5eebddb682eac755'


Trivial merge