merge of '05c8ac666734fffe4be207c184a8d6ec410c203f'
authorKoen Kooi <koen@openembedded.org>
Fri, 29 Aug 2008 17:40:21 +0000 (17:40 +0000)
committerKoen Kooi <koen@openembedded.org>
Fri, 29 Aug 2008 17:40:21 +0000 (17:40 +0000)
commit9aabad5771b24f0da302faf9f396d73dd7166d30
tree4e3bd8fb58c5e6d303aae1d46d3d5168ee68808c
parent1ce0638fe75c1c2f764c01cb60deb7920d6bfbea
parente688507ddf5b39b7bb900bae0c6db4d53bf8451d
Merge ... '05c8ac666734fffe4be207c184a8d6ec410c203f'
     and 'cdd9d1c543126b02dd14925c940ec6a31e071be8'