merge of 'b091298f5a7429063b7fc43393d70a224e4a5d99'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 20 Aug 2007 17:47:51 +0000 (17:47 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 20 Aug 2007 17:47:51 +0000 (17:47 +0000)
commit79acea313ac47165c6b3c55224484c4420e06720
tree950d6f09297871fe88e564fad6983aef7b2b1f62
parent6e9c45c2c4f8f33aec7cda649c3e0236075a0ced
parent9c6fe0eb6939836dd5c84e37d93d6c32c31dd27c
Merge ... 'b091298f5a7429063b7fc43393d70a224e4a5d99'
     and 'b7ecd3fb6f5dac44f9fe8b851242aa671d666c3a'