merge of 'b6708d0e783584df013d6e06de41bae699f0bd34'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 27 Sep 2006 13:52:38 +0000 (13:52 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 27 Sep 2006 13:52:38 +0000 (13:52 +0000)
     and 'eef154087bbe16b0d2143a5c529dab7e716705f8'


Trivial merge