merge of '2f5ddd4439353dd39a492ac747a3f655b361c234'
authorKoen Kooi <koen@openembedded.org>
Thu, 19 Oct 2006 11:17:14 +0000 (11:17 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 19 Oct 2006 11:17:14 +0000 (11:17 +0000)
commit7000c64fe8dec124cd3ecdd08227c6ee41ee9e7a
treeb2e1c2f923db76794e7cc2bcb265cbaf54153f7f
parent157fcb8d7c3d0c164aa81fd72b676c6620aa252e
parent7c99464aad7bac74d062566cd7b70fe90e5a715d
Merge ... '2f5ddd4439353dd39a492ac747a3f655b361c234'
     and 'bef23ed01b940f3c5bf62b3bd5e591a33c509ef6'