merge of '89819f9979e4ce42d678a887b2cb1a7daf6b614f'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 12 Dec 2006 14:45:44 +0000 (14:45 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 12 Dec 2006 14:45:44 +0000 (14:45 +0000)
commit484d83ea57039f83968f425646084e3298bf3c50
tree19f70e5c3a89668836ea4a83b6eadf739833d4a2
parent288adb52fd3f802deafa9b19257b3eff610f97b2
parent75d841fdcb14ec69dc70c7629718a5611914ba37
Merge ... '89819f9979e4ce42d678a887b2cb1a7daf6b614f'
     and 'fad26c77ecded8ba097147c4f209e7ba4d5ee19f'