merge of '860bccc90a045f54a0fd143d4759959d43643350'
authorKoen Kooi <koen@openembedded.org>
Sun, 18 May 2008 12:00:22 +0000 (12:00 +0000)
committerKoen Kooi <koen@openembedded.org>
Sun, 18 May 2008 12:00:22 +0000 (12:00 +0000)
commit24afb9966c4337bb3fe66fb42bb5cc845e2ab212
treee229f79fd536812aa0f20e4e2bde0fd4329e9ab7
parent13899c1db914722bcc635b1752f7e473ccaeaf4b
parent53877222d5a1a0d9d3783618eb3100d63786404e
Merge ... '860bccc90a045f54a0fd143d4759959d43643350'
     and 'd0e6322f95c05a9799955013d3c7dba65d4cc401'