merge of '2e1c605ca0c29e297c3422f1de81c581a6a42ed0'
authorKoen Kooi <koen@openembedded.org>
Thu, 31 May 2007 22:11:16 +0000 (22:11 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 31 May 2007 22:11:16 +0000 (22:11 +0000)
commite6c6a57d912c8785fcd803303d0482393e4d443f
tree90fb5e9512e487cd9674e5e407f79d7cccfbabbf
parent3e4ebb38bb4924d6602187e503d8cabac459a856
parent1482d1ba526456ff291fdfdeed6be4dddb5b3c61
Merge ... '2e1c605ca0c29e297c3422f1de81c581a6a42ed0'
     and '78f88c31615c9cce59031db7596657c2afd18872'