merge of '101fe5719b8175ae1fd5c8bb133f3310512691c8'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 18 Jan 2007 10:04:29 +0000 (10:04 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 18 Jan 2007 10:04:29 +0000 (10:04 +0000)
     and 'eb0e1154b5abe11697940d2990aa6f0cd6441118'


Trivial merge