merge of '714d18ab0ac1f1a1eac49614202379c5e280243b'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 23 Oct 2007 19:03:39 +0000 (19:03 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 23 Oct 2007 19:03:39 +0000 (19:03 +0000)
commit0237c31ae0ea01dc9235c0a1400860f3350d1181
tree7061a1a1d47b572c5943e43d28ca14d1f63a1210
parent64967f326033d4e5c7c360b4d63ac8c00d182693
parent9b9dab1285a359e8b713b7589d75c223cdb382df
Merge ... '714d18ab0ac1f1a1eac49614202379c5e280243b'
     and 'c9981e7f0cdbc263c56a265edce6737f4b66cc40'