merge of '34f6928a9e37b4cbcbf32f2d5a04ecf42a67b8dc'
authorKoen Kooi <koen@openembedded.org>
Tue, 12 Dec 2006 14:14:13 +0000 (14:14 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 12 Dec 2006 14:14:13 +0000 (14:14 +0000)
commit75d841fdcb14ec69dc70c7629718a5611914ba37
treeeac3aa808ced289ac3d6ff073ff794132ef162c8
parent4ce3a656d2c65c120454150c87965e731612733a
parentb8788e1beebb978de3fed927379f8df781db7c91
Merge ... '34f6928a9e37b4cbcbf32f2d5a04ecf42a67b8dc'
     and '4f46377bcdabbb736ecf3eabda1271d12fccfcd1'