merge of '3c5eeab152463150e763af8e2364e135eabc995b'
authorKoen Kooi <koen@openembedded.org>
Tue, 12 Aug 2008 14:26:28 +0000 (14:26 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 12 Aug 2008 14:26:28 +0000 (14:26 +0000)
commitb99a9f05a0a96c3e3b631f576a5a84dd2767fc62
tree6108dc59360953ae64164ece7320c0285300c66b
parentbb857117246bcabd2a849d95c8bf84c01c6635ef
parent9581813672f12f114fbdcd8f37aab298a8c3e7ff
Merge ... '3c5eeab152463150e763af8e2364e135eabc995b'
     and '927230fdadc85c2a14f2f4ee848fe29c94d9ffe1'