merge of '53e608aeb23095887be63ad8796f84461a850a1b'
authorKoen Kooi <koen@openembedded.org>
Wed, 4 Jun 2008 09:43:40 +0000 (09:43 +0000)
committerKoen Kooi <koen@openembedded.org>
Wed, 4 Jun 2008 09:43:40 +0000 (09:43 +0000)
commitb55839a615f3e9ad62224e5f6236009ef936423f
treee2685105138b022f4ac50a190a9ace7d111186d5
parent9da0b3f3a8add3115c611b34dd53fc1c0b889861
parent036b408ebcef2f92b61929cccf5b1ae87f3fe7ba
Merge ... '53e608aeb23095887be63ad8796f84461a850a1b'
     and 'd2747ed616c9b8d91ec15a38b2ed5183e011220e'