merge of '81ce749b8f57a5a56ca3f31c843da1b227a8a48d'
authorKoen Kooi <koen@openembedded.org>
Sat, 14 Jun 2008 16:54:57 +0000 (16:54 +0000)
committerKoen Kooi <koen@openembedded.org>
Sat, 14 Jun 2008 16:54:57 +0000 (16:54 +0000)
commit6e14c89c8ecad2dc17a2e0efbdf24dacb690ff41
tree7b5aaff814a7bc50f5733ffc6e2e1332d869924d
parent1682d5f8e9ada57a3b1e3561c1c56e61a42514bd
parente65026a7dc0947c97ccb14891eea09fdc3659a7b
Merge ... '81ce749b8f57a5a56ca3f31c843da1b227a8a48d'
     and 'e21e6187b919035f20b69c9c2a3c8f43e345d930'