merge of '4a394f7770c7d370e3ad0bf4e77cb2288e195180'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 3 Jan 2007 07:25:52 +0000 (07:25 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 3 Jan 2007 07:25:52 +0000 (07:25 +0000)
     and 'c1c78bb1b00381defbcf8941f26b336eea75e8b3'


Trivial merge