merge of '416f841049c84e97f18fad677688af32cbc68636'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 11 Jun 2008 23:17:50 +0000 (23:17 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 11 Jun 2008 23:17:50 +0000 (23:17 +0000)
commitd155644256cf2c33be2d70f1179e63291d229c7f
tree7a596fae81c5a6a3e42b650867ad1df0a65a80f4
parent842bca7716c1fcf1627b87d7b478805ac283ecfa
parent077441a48b6313cbf3b2a81a7a263fa67c41150b
Merge ... '416f841049c84e97f18fad677688af32cbc68636'
     and '8d96efde3687c41c8d5111e4be606b8b0946167d'