merge of 'b60b9cbd9811d42fdfd03aae3fb9d35d428d7ddc'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 18 Aug 2006 15:18:32 +0000 (15:18 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 18 Aug 2006 15:18:32 +0000 (15:18 +0000)
     and 'f9c6177ac97fd742ce5f6eb06a988296fa777bda'


Trivial merge