merge of '65ff7721de076446ac1291f0f00a8fb30df71eff'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 5 Sep 2006 08:22:33 +0000 (08:22 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 5 Sep 2006 08:22:33 +0000 (08:22 +0000)
commit54c72cf4b1f664f589a9cef32aef76518d3d1198
tree7124011c1fa58d775b4485c9af82668026b5e4a7
parentad12adb814e3c3b749eae780c45e32047744e429
parent1ecb6418e1fbf8736bb5901b8a5f17052c241bd7
Merge ... '65ff7721de076446ac1291f0f00a8fb30df71eff'
     and 'b13a3adc90df932a6883441aed9566c63536b2a6'