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)
     and 'fe8aa989bb329724151b1ae11e021e80ec7ff5f5'


Trivial merge