merge of 'ddc1435bf9be5344c25c778b1bc2d6af4d04448b'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 3 Jan 2007 10:19:19 +0000 (10:19 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 3 Jan 2007 10:19:19 +0000 (10:19 +0000)
     and 'f6f04acc928b89f8740f4f2ef14b479a36781bc5'


Trivial merge