merge of 'ceb311a2e1a0c02e7e63ba78db2d0de804ad8a8e'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 13 Jun 2007 11:16:59 +0000 (11:16 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 13 Jun 2007 11:16:59 +0000 (11:16 +0000)
commit722f687674124b9a341dbb74560ae3111c20e993
treed4937b3fe2964b002f207a354dc098b3db38b2b4
parent2782d40793564a0defeb865029862aaf9a93417c
parent5a1de9dce06cec3b38de01f8f1108a6bcf4685ca
Merge ... 'ceb311a2e1a0c02e7e63ba78db2d0de804ad8a8e'
     and 'd497ec8dfe10c80ed2e58aa10f7448d60b03f6c9'