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)
commit55d68353a541f363a196d51eac01b6a3ab8c54a4
tree041da3bf21685d908c42ea77be5b6be2e87e4d17
parent94e1ce507e69378472f22faedd6606eb91510e6a
parentbab0c48ac5132ad63b4f3da27a1c39c20b5db86c
Merge ... '2409f1286888442abc1534359db7a59eb6d8b5fd'
     and 'f42403739ba7106ebfe92b3af59bf9c81b54f06d'