merge of '6a0bfe7d7f1e6ca611514ff0861ebfa76ea062f6'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 5 Sep 2007 09:36:18 +0000 (09:36 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 5 Sep 2007 09:36:18 +0000 (09:36 +0000)
commitdd53e4480b27768add5a152c594007686584f92e
tree12fbeba6f14bd0de44d963112e39ff3d5acb78a5
parent5d158d7d1127cbcf9075b2ebfb1f8d9271d969ad
parentc05d55081272744d21f72e174c1aebc24771fc1f
Merge ... '6a0bfe7d7f1e6ca611514ff0861ebfa76ea062f6'
     and 'f3c601a77595a1ec641680720217a08492202fba'