merge of 'd1543bd877e6311e2749d600361efe4cd9878cac'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 11 May 2007 05:22:24 +0000 (05:22 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 11 May 2007 05:22:24 +0000 (05:22 +0000)
     and 'dfdbf1d54d6ce999d055cd74a93fa254d002e119'


Trivial merge