merge of '80203f8e0e1f0ca5359560cbebadc073a4aa239c'
authorKoen Kooi <koen@openembedded.org>
Sat, 28 Oct 2006 16:43:13 +0000 (16:43 +0000)
committerKoen Kooi <koen@openembedded.org>
Sat, 28 Oct 2006 16:43:13 +0000 (16:43 +0000)
commitd92174e738d4e8a0674a9bc7c2d5a0e777e9d936
tree2ade1c3dc425790dc5f3235924e9569b4c1448b5
parent7e53d9ec53589d1e900ef9c0c18ec962e2302603
parentb2326e7420103c6e77e7d22cd6e72334f860bc01
Merge ... '80203f8e0e1f0ca5359560cbebadc073a4aa239c'
     and '8605cce0c3f57ef0a8d2c41260b71d2e06273548'