merge of '152bd050ede96601db58624788435d4ce651b13c'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 7 May 2008 15:20:04 +0000 (15:20 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 7 May 2008 15:20:04 +0000 (15:20 +0000)
commit287d816e5c2adfa726db9cd4025189b97f57dd9f
tree5c5c063b1b89b9d4d3a86cfceea7ed0818484b5f
parentedf0c5d29fa3265a77c6cf13053e2cf16dc7c0cf
parentba5d25e5a636076970fa93811905185108ebe9e6
Merge ... '152bd050ede96601db58624788435d4ce651b13c'
     and '2b28a077b8cfb9486d59a3f3a4e44bdb8b90dde9'