merge of '1ba445dfd1a9b934962a4db388d6ab641b3f74e8'
authorKoen Kooi <koen@openembedded.org>
Wed, 26 Mar 2008 18:46:06 +0000 (18:46 +0000)
committerKoen Kooi <koen@openembedded.org>
Wed, 26 Mar 2008 18:46:06 +0000 (18:46 +0000)
commit48fd147498115e7682153b9ec28f4ab0065a845e
tree86b0d7876538f6c5f2e73a82020864ac10e9d020
parentf76280c3bdee25e5126d68f3891bb240b3cd1ce9
parentf7147e250bbe3dfc84913aa7a16d58026d98ae90
Merge ... '1ba445dfd1a9b934962a4db388d6ab641b3f74e8'
     and '8f2da0702f522e178a88e3c2dd8f65e05d0680a7'