merge of 'c80d3d5fe446b4ab1b902de2706822e04b306ab8'
authorKoen Kooi <koen@openembedded.org>
Tue, 13 Feb 2007 20:45:16 +0000 (20:45 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 13 Feb 2007 20:45:16 +0000 (20:45 +0000)
commit824ca8e331f11bf53b33697a5b3a4cc2edfc82f0
treecc0d7324a067ecf72754ef9501aeb4362aa9dfb4
parenta7d5f5476e29516c2e2a1ffe35b37fb067121d5e
parenta48dc80e6bf3d848311996d32ecd71eff3602643
Merge ... 'c80d3d5fe446b4ab1b902de2706822e04b306ab8'
     and 'dd511be6577324f0680f20fabc392b0941182942'