merge of '85a2f16fc0d263698947f31a1f50694c14d86e70'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 11 Apr 2008 17:44:44 +0000 (17:44 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 11 Apr 2008 17:44:44 +0000 (17:44 +0000)
     and 'ac0792f17a9fb0d1306d68b84abb3370a80d4bce'


Trivial merge