merge of '424953790319440fd6f6ed53f7e06225ac29f8df'
authorKoen Kooi <koen@openembedded.org>
Thu, 27 Jul 2006 10:19:09 +0000 (10:19 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 27 Jul 2006 10:19:09 +0000 (10:19 +0000)
commite25e30f9b39600d8911dcda9116d8d665e508e79
tree69be9bb294fe767ac2524b943b402a6274efc757
parent12231e94d7fdc5b17915a519404a3944f02aab70
parent4ef932c6ce0f68746ad01226072b11a0a9504ca6
Merge ... '424953790319440fd6f6ed53f7e06225ac29f8df'
     and '9f101a66008e48dcb6c74d97567cb656101bd8a0'