merge of '302e0ca21f4b6312fd7c254667eb4f20a5601ef6'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 31 Oct 2007 12:05:30 +0000 (12:05 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 31 Oct 2007 12:05:30 +0000 (12:05 +0000)
commit821528ad116a72c2323d88d21e979614c78f1b41
treebf13abe1c623a23564903e9783bb56501a2040df
parentb7b56fd44ef5d00833d230d2c065957728fe9104
parentf85953aaa329431ef789c40c27e8bcc8c242aa96
Merge ... '302e0ca21f4b6312fd7c254667eb4f20a5601ef6'
     and 'cdb2e28e89c82aad619cd71c60829800e4dd8d0b'