merge of 'ba75ce699520265ea15b201913787870af7e0572'
authorKoen Kooi <koen@openembedded.org>
Fri, 20 Oct 2006 13:15:17 +0000 (13:15 +0000)
committerKoen Kooi <koen@openembedded.org>
Fri, 20 Oct 2006 13:15:17 +0000 (13:15 +0000)
commita1e0f23576174cb4134b28deb3f2eca47bb86bb8
treea1a567ecbe92f28719db0b9c3df116392b43510f
parenta00bee6c14e1d2a48faab7ab45723f120f736e62
parent12763780a2fea690941c39a0511293600850076c
Merge ... 'ba75ce699520265ea15b201913787870af7e0572'
     and 'f535484a11d9a7f9de067f6f66a12a8e321e6a0b'