merge of '1fc4ea9615a3789569ba8f07b7090012fce2afbf'
authorKoen Kooi <koen@openembedded.org>
Sun, 18 Feb 2007 11:35:36 +0000 (11:35 +0000)
committerKoen Kooi <koen@openembedded.org>
Sun, 18 Feb 2007 11:35:36 +0000 (11:35 +0000)
commitaa5be9a374e7c4279f4d86d299d518538bc7bead
tree4eb0d6e24276b39ee706ae322c8e3ed11b59a1e7
parent56cf5d44c949b7096bf8376787879f0705b7a052
parent8c7cf3fc473b8c65bc972028ae4ce581b7b4bce8
Merge ... '1fc4ea9615a3789569ba8f07b7090012fce2afbf'
     and 'e63a2eefb4ae9542b7ac7ee72c2f0aad1d534886'