merge of '1413d095164c683305cfc29d3e275c6cd0aff5c2'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 29 Sep 2006 20:33:45 +0000 (20:33 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 29 Sep 2006 20:33:45 +0000 (20:33 +0000)
     and 'c08c1b4bb94a697cdae713e266562bb43944ba77'


Trivial merge