merge of '1e14a41a1a368acd06c76c94c9e67fd660fd6d0a'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 27 Sep 2006 14:07:19 +0000 (14:07 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 27 Sep 2006 14:07:19 +0000 (14:07 +0000)
     and '2061d23a8305360c778930e17936cc30ce12b906'


Trivial merge