merge of '038bc21b349c21561050092a7a6d68a019b921e1'
authorKoen Kooi <koen@openembedded.org>
Thu, 26 Apr 2007 16:54:16 +0000 (16:54 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 26 Apr 2007 16:54:16 +0000 (16:54 +0000)
commit0f8454ab7f54dbc0867fa8722034630654ce2a87
tree8ff02762adcd8546398394fec08e36d8d2cafeff
parent908abeae497d81c0afd6381c08311aa45555157b
parent5df246428e3dda8ebfb5b7c46ff4ba42d291d54c
Merge ... '038bc21b349c21561050092a7a6d68a019b921e1'
     and '72018d16d4bf3617a2f7efda54bde7f5b784e01a'