merge of '386f054189c8baaee86e3bd28d60abe9c7bbd49f'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 17 May 2007 17:01:37 +0000 (17:01 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 17 May 2007 17:01:37 +0000 (17:01 +0000)
commit7605d989539a54cb2e6a00fba7cd3943bb9be7ec
tree36a56fc8fcd026f49878d14d97d3de81f6e113c9
parentb0fdd5d38e3b9643df309243d62c8ffde88d141f
parenta254931ed9bf508a6685c5e9ff3028e4644bd1aa
Merge ... '386f054189c8baaee86e3bd28d60abe9c7bbd49f'
     and 'c03cc3e57ade4e24200269ffc91fd0910b4093b0'