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)
commit10c7149170c9123592c43909c3443b58ff71d372
tree6f19254c9007119afccbcbb59a9c113d2cc2b8fe
parent5648d5dbe9e49b2c53d0c80899370c6979b121da
parent242485f1bf19d1b1a6ba08e74afc98d160135bf3
Merge ... 'd1543bd877e6311e2749d600361efe4cd9878cac'
     and 'dfdbf1d54d6ce999d055cd74a93fa254d002e119'