merge of '0214582b05132b8f733d073082c352b0d19100fd'
authorKoen Kooi <koen@openembedded.org>
Fri, 15 Dec 2006 18:04:47 +0000 (18:04 +0000)
committerKoen Kooi <koen@openembedded.org>
Fri, 15 Dec 2006 18:04:47 +0000 (18:04 +0000)
commit56e8add4fae9835a65b3d980548164d5e9e46d20
tree19df8df4e0d8604076449c090330d44baba7bc45
parent87d9fca0fc4112b5ca07d92af10a2e9ef1bf8d0b
parent85db90bc0b87436273ac56d20959958d7bb980d2
Merge ... '0214582b05132b8f733d073082c352b0d19100fd'
     and '14230563337c9e6187dd230e4e3cd50fffd742a8'