merge of '4b73558623bbfab1759729a3f14c435cc6b440a1'
authorKoen Kooi <koen@openembedded.org>
Mon, 9 Oct 2006 15:57:32 +0000 (15:57 +0000)
committerKoen Kooi <koen@openembedded.org>
Mon, 9 Oct 2006 15:57:32 +0000 (15:57 +0000)
commitba2edadd18221dc8a79713c4bcf8805a29ae6bd8
tree70feb110754e77ec418feb31262b3950ace9366f
parente6c73a1ccde522acd0cbe807a4dff2464b811aef
parentb3af978db4d50f8f7f94c65cd6a70933eab4510a
Merge ... '4b73558623bbfab1759729a3f14c435cc6b440a1'
     and '6a4ecd57e9c1dfc1820534343f16826f245b2a59'