merge of '5aa0bfca72176a539f36057d142b7fbc248c3987'
authorKoen Kooi <koen@openembedded.org>
Mon, 20 Nov 2006 09:37:38 +0000 (09:37 +0000)
committerKoen Kooi <koen@openembedded.org>
Mon, 20 Nov 2006 09:37:38 +0000 (09:37 +0000)
commitaea8fb5d62aff1f9056326fd5b8fd54d791912f0
tree954c85ccd915748bea26210049b507ecb17b69d1
parent52bf93a170c28b4b7169ba88b07d4c81efb7d4fe
parentacd9d61d0359afee6a4bcb8f02a26ef750f963a8
Merge ... '5aa0bfca72176a539f36057d142b7fbc248c3987'
     and '7f11ce9c6210928dc642453f15126ac6ff44f108'