merge of '2409f1286888442abc1534359db7a59eb6d8b5fd'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 5 Oct 2007 12:58:57 +0000 (12:58 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 5 Oct 2007 12:58:57 +0000 (12:58 +0000)
     and 'f42403739ba7106ebfe92b3af59bf9c81b54f06d'


Trivial merge