merge of '0e517dabcd24598274e65b9a372217fa56ffe66a'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 20 May 2008 19:56:51 +0000 (19:56 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 20 May 2008 19:56:51 +0000 (19:56 +0000)
     and '560eb1fe854306a1781ae17f1c30c0271e110cfd'


Trivial merge