merge of '418c8f8721711c31d603902018e139a4834946ca'
authorKoen Kooi <koen@openembedded.org>
Sun, 5 Nov 2006 21:34:27 +0000 (21:34 +0000)
committerKoen Kooi <koen@openembedded.org>
Sun, 5 Nov 2006 21:34:27 +0000 (21:34 +0000)
commit3bed0d20587c3e972199c8fb72c4e945d1168d4a
treebad9ad48ddbf5d36ef8f2523f62011727485a493
parentc12a883eb7ef9fcc7ca1abbcffb97f5d17bee7fe
parent352bfcca5872ac2fb54337b111204423f0afa3fe
Merge ... '418c8f8721711c31d603902018e139a4834946ca'
     and 'f4f260a7113d446b401c939f0bba03f887e2d69b'