merge of 'a675a323523cfdb282fa64bd2a0e42d19d71db33'
authorKoen Kooi <koen@openembedded.org>
Sat, 2 Aug 2008 14:58:39 +0000 (14:58 +0000)
committerKoen Kooi <koen@openembedded.org>
Sat, 2 Aug 2008 14:58:39 +0000 (14:58 +0000)
commitd7c3d88c18c722a4dfd1e5717f67f90a2ae6f3ce
treede23b4b26a3069b82d44e3e23ae9550b057f5ef7
parentf98529ad1445ec0ede4cd65b58b63284c1c538ea
parent5edd670ee7e27644853b06be503e8e54a06ef753
Merge ... 'a675a323523cfdb282fa64bd2a0e42d19d71db33'
     and 'b67dfab13ef7114048f172a8cce5a15a5e2f5b07'