merge of '36dc1826480be70d657adcad4878a3f6f3e9092f'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 19 Dec 2007 19:54:49 +0000 (19:54 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 19 Dec 2007 19:54:49 +0000 (19:54 +0000)
commit2352395de65b3a87fa0167f890fee4e53bdfdb78
tree46854e2edef0ee63645db2d030427fdaf502721d
parentffa607e773edc24b09142452a7f3824d304c9599
parent85dcc0880acc84dba4d8538e27f132f050e4c1d8
Merge ... '36dc1826480be70d657adcad4878a3f6f3e9092f'
     and 'cab9fe526eef22de96cde31f68aacaa77ce0f9fc'