merge of '210c562ba9ddf03eaef5986221c80453bb820d06'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 12 Mar 2007 08:03:33 +0000 (08:03 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 12 Mar 2007 08:03:33 +0000 (08:03 +0000)
     and 'd475ef60528ca38e050166ebe1d3b28dfd9d3efa'


Trivial merge