merge of '25c9bf8030ed9b081cb15b534fe5dbd9bf20ad4e'
authorKoen Kooi <koen@openembedded.org>
Sat, 5 May 2007 21:48:57 +0000 (21:48 +0000)
committerKoen Kooi <koen@openembedded.org>
Sat, 5 May 2007 21:48:57 +0000 (21:48 +0000)
commitbc11ed6326881fa5726bd4430c0dc06da3e6e0b4
treeb59ec3b09bb96d6ff55d14181e988cc27e40385c
parentfaf3482413a3d1a7e121aaf3fdff2497b56c089e
parentd3d9a79269c489cbe311da7f1222ca606267bb90
Merge ... '25c9bf8030ed9b081cb15b534fe5dbd9bf20ad4e'
     and '30f2bd37e3e52038872a5a374ce62ae9b90855f6'