merge of '5e25d910364ba4a7edab739d7fd27220ff39668f'
authorKoen Kooi <koen@openembedded.org>
Fri, 12 Oct 2007 07:54:22 +0000 (07:54 +0000)
committerKoen Kooi <koen@openembedded.org>
Fri, 12 Oct 2007 07:54:22 +0000 (07:54 +0000)
commitac24763c52746d29e474e296392a9d5a1e29fdf2
tree51668635e08d0a0c6b60bb5ef9448f40d9e5bc75
parent6e737e8e1c8bf4a168a8f62c5d5ae2f4424319b2
parentc751ec57bd75446f7dbc99e1c5a403b383cc0b48
Merge ... '5e25d910364ba4a7edab739d7fd27220ff39668f'
     and '90a4eb99d1b346a81de3232bd341d5b76a2bbc2c'