merge of '344b86124dcdb7509a844c86928cdee99994139d'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 22 Jul 2008 16:30:23 +0000 (16:30 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 22 Jul 2008 16:30:23 +0000 (16:30 +0000)
     and '806e3f07f060ec38e52b0328840c81fc0f06b90c'


Trivial merge