merge of '597405ebde19640675e0298f9206b90ef981a115'
authorKoen Kooi <koen@openembedded.org>
Sat, 6 Jan 2007 17:34:59 +0000 (17:34 +0000)
committerKoen Kooi <koen@openembedded.org>
Sat, 6 Jan 2007 17:34:59 +0000 (17:34 +0000)
commit650cfd39f24f50e6de3009c9856197ae047d96b9
tree66738093b4bcdf24df5ad354d54099f17a609310
parenta8c1651daf72e15ef6bce95f40ab7d30363e2a5d
parentd28f5b320d43e7f78d150c210aafe52a7f744c03
Merge ... '597405ebde19640675e0298f9206b90ef981a115'
     and '99de646e9cb82eeb39c4f398143893df2395644f'