merge of '23094adbbe1c0cf4e6533536f3d839d77e1e5bbf'
authorKoen Kooi <koen@openembedded.org>
Sat, 14 Jun 2008 18:03:44 +0000 (18:03 +0000)
committerKoen Kooi <koen@openembedded.org>
Sat, 14 Jun 2008 18:03:44 +0000 (18:03 +0000)
commit3eececf1f8f38a4fcaff2ed778a39bddecf6ae18
tree9245583d038dc219b29f62e92ed1b6ad7d5414ed
parent0aaa95c131f07a9fe34685b9843e4857caf14f26
parent6e14c89c8ecad2dc17a2e0efbdf24dacb690ff41
Merge ... '23094adbbe1c0cf4e6533536f3d839d77e1e5bbf'
     and 'e52349bdf770c1441b7661f55056b3cf08ffe21e'