merge of '0135b9c8cb83a5549aee08d6ce8638b76d8230a4'
authorKoen Kooi <koen@openembedded.org>
Fri, 24 Aug 2007 13:17:54 +0000 (13:17 +0000)
committerKoen Kooi <koen@openembedded.org>
Fri, 24 Aug 2007 13:17:54 +0000 (13:17 +0000)
commit778724cb7918c3cda2a2d23610a51dba58e7b6ba
treeef5d6d4f16da199f48791e9f595c772f9491b4b1
parentc748887a42f92eff887578ce1341e5b95cc50b05
parent866529bae981b5cdf8700ffaba239fba4e41859b
Merge ... '0135b9c8cb83a5549aee08d6ce8638b76d8230a4'
     and '340da43485a96531933592289a8115f52a246a86'