merge of '242a466ed405559b9394dbf1b3a8678ba25cf86f'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 3 Mar 2008 16:19:10 +0000 (16:19 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 3 Mar 2008 16:19:10 +0000 (16:19 +0000)
commitbccc0c67f2d14c3aeaaff7eb014b082489db96c4
tree837bc3b12446ebd4171c92f9a105f93ecc073ba5
parent27ab96dbf10ef5111ea8b7ff8982bf428634a385
parent6513124634a62902dd2e66029dbaf04a4cf14fe6
Merge ... '242a466ed405559b9394dbf1b3a8678ba25cf86f'
     and '728bbddd3caaaeb9c83d85b9eb213042e12070bb'