merge of '915e7bca8f798ca0d2f6da81429ccae09aa97fd5'
authorKoen Kooi <koen@openembedded.org>
Thu, 29 Mar 2007 18:25:06 +0000 (18:25 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 29 Mar 2007 18:25:06 +0000 (18:25 +0000)
commit3013f93ea503a033949b2c20b532fca8d7fc97d4
treee374b6a8e538dd3a5d2d74a9a7d1a7497dec9c60
parentc9fb0e6b677050e621003e6d1b47d5e44b7ef5ba
parent3e7a625b0563f0163a9b41969764b35ac68e88b3
Merge ... '915e7bca8f798ca0d2f6da81429ccae09aa97fd5'
     and 'bb10d8a365ae5156ad44c564e8bb6e71c9ec65de'