merge of 'c1ea3a8ae4f9e7d4be16a51f112cef674a5306d2'
authorKoen Kooi <koen@openembedded.org>
Mon, 8 Oct 2007 09:36:59 +0000 (09:36 +0000)
committerKoen Kooi <koen@openembedded.org>
Mon, 8 Oct 2007 09:36:59 +0000 (09:36 +0000)
commit5db7b190c127908b9abc9cfe3ad462c83e763f4b
tree0c8fa9d1502d7639e53f5b11751aea0e3c23d001
parentc57324b477a8fe770b43452dd9250b487ec2823c
parent438e5f64402239782ab636d0bbafcbea98ec2e50
Merge ... 'c1ea3a8ae4f9e7d4be16a51f112cef674a5306d2'
     and 'd8fef75e4f14930650c56b6cce60305fe236f93e'