merge of '903b9a5eb1d39b78da1e187836b7e48392af7847'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 20 Aug 2008 01:44:22 +0000 (01:44 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 20 Aug 2008 01:44:22 +0000 (01:44 +0000)
commit79a931b5c41b826653c6cd84bfaed87e7c7d9d9d
tree272621a06fba9271dd48f89c8c9004cfcb7c4a2a
parentec81022748a817236c409744a092d06bb7d6605f
parenta3f2c683d798c880b8855ed656768e5bdab9fca9
Merge ... '903b9a5eb1d39b78da1e187836b7e48392af7847'
     and '96bb50b900f61d2cb575adb3ca0b6db5a6694ee2'