merge of '28f5b60141cb1b866dcc89f47a6599c6b64dfbc0'
authorKoen Kooi <koen@openembedded.org>
Fri, 28 Dec 2007 16:37:02 +0000 (16:37 +0000)
committerKoen Kooi <koen@openembedded.org>
Fri, 28 Dec 2007 16:37:02 +0000 (16:37 +0000)
commitfb694ae0d0781bb1e40766c01b58160b77e52791
treeaf496728c0aca8d2a289bc0427ec6c352151fe2d
parentad396ce905ce081454d1546a806e5cf851198b09
parentfd5705c7b2b033c340e2396d69e7af5c7d1f00a4
Merge ... '28f5b60141cb1b866dcc89f47a6599c6b64dfbc0'
     and 'd322189b0c434dffdfdb6b22847f6660c0e95ac6'