merge of '32cacec64cdbd8fb3ef60cf340711ad9e3b80d98'
authorKoen Kooi <koen@openembedded.org>
Sat, 27 Sep 2008 08:10:25 +0000 (08:10 +0000)
committerKoen Kooi <koen@openembedded.org>
Sat, 27 Sep 2008 08:10:25 +0000 (08:10 +0000)
commit6bbb5b3f138356a3422acfd882f9a3793659be08
tree6b897178a32e29546f0dabeb9bd8473c6d67faeb
parent56ab9fc19519aca3a0e8b8280837f1f7866927ef
parent6387fafe110943ca9a23eda522a7101cf00d3af8
Merge ... '32cacec64cdbd8fb3ef60cf340711ad9e3b80d98'
     and 'c8a9321165acfe4dabcb4b602008270c7d2ea7c7'