merge of '6a0dba34fcb662231f3a7f15f592a0c89586df4a'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 29 Dec 2006 18:27:59 +0000 (18:27 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 29 Dec 2006 18:27:59 +0000 (18:27 +0000)
commitd77ab609a4793164b198a60de58699eeec1263be
tree3029498999f34df1e18fd6fdb93ef33d44a15aa3
parent89dde6ff0792458e5fc6af9644a9ddb9c0c55dce
parent7609259d5057b17caf256733fc1f5955ab4cd5f5
Merge ... '6a0dba34fcb662231f3a7f15f592a0c89586df4a'
     and 'fe8aa989bb329724151b1ae11e021e80ec7ff5f5'