merge of 'dfe542a129a68cf1ad09b99b69533dacab99aa45'
authorKoen Kooi <koen@openembedded.org>
Tue, 20 Feb 2007 08:02:45 +0000 (08:02 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 20 Feb 2007 08:02:45 +0000 (08:02 +0000)
commitc36c8a8baa7da89a839e830f491f4bb3d8d6dcd4
tree18a8d11f0e61162707107ff4c87b753146abc2dc
parent23ad6c5fc6e8a79fecf6b926fa4e42e8887f28ff
parent4bd8cc8d629e8fabdf289381727d2e1de58acb82
Merge ... 'dfe542a129a68cf1ad09b99b69533dacab99aa45'
     and 'f8ba681a759e18c7e1b2aa54b3dae1efb1b41eea'