merge of '697fec81441b0b917323c2bac556f686813d0440'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 20 Nov 2006 09:31:29 +0000 (09:31 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 20 Nov 2006 09:31:29 +0000 (09:31 +0000)
commit52bf93a170c28b4b7169ba88b07d4c81efb7d4fe
treebfa17f7c37d0f76358fcf20eea00ca1fd3002b3f
parente0726983e291c4d7670cdba399808763c993b25c
parentd9c7d747c84dcd014265b2bfda3622ae7975730f
Merge ... '697fec81441b0b917323c2bac556f686813d0440'
     and 'e7c3c58ffc25bb74008c4dda3d77ba4eae16e8f0'