merge of '0c2d5d5458d1b1d0d5206b62671a36916592392a'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 16 Jan 2008 21:01:37 +0000 (21:01 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 16 Jan 2008 21:01:37 +0000 (21:01 +0000)
commitd3b631e4aa1de6111936a42ef7d8ffa07575c8d0
treee9797409e6cf1d7e6dc06fb2e4bb36eed4d0dbfe
parentc0a2cab482a1b0f1b673ed81f0ea77fb13f670f9
parent11995b66610a077ec02ac62d8563d554619b9c97
Merge ... '0c2d5d5458d1b1d0d5206b62671a36916592392a'
     and 'cb0f0a066b9df17408c3017f7954a6b750fd269f'