merge of '54413dcee93082ea892457c360c17618573085e5'
authorKoen Kooi <koen@openembedded.org>
Tue, 27 Mar 2007 18:28:36 +0000 (18:28 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 27 Mar 2007 18:28:36 +0000 (18:28 +0000)
commit232a9501aa2121352b2dcd0503e15818a317956c
treeacaee603a71de4b94c8961732cd7986484c85d6b
parentb693f3601b15385a806ee6eee969e2e1e944639b
parent1566696e78ee5757811d43ef5eae09bad406d050
Merge ... '54413dcee93082ea892457c360c17618573085e5'
     and 'a20c57790313df2a879b212ea94a0b1f65411301'