merge of '2d7ccf067fb2306addce3d751e077c398ca4df93'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 13 Nov 2006 12:50:51 +0000 (12:50 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 13 Nov 2006 12:50:51 +0000 (12:50 +0000)
commite6117e46921a823fea45cbb549614e73f5e5b5ee
tree0cb5faf22d1b6db60070674b3e2ad7352e1b69b2
parent37bc26da4364658af90eb7da75cb6dd60f9fc074
parentd507b32520cc3698ebc5d6213af6ac35838baf74
Merge ... '2d7ccf067fb2306addce3d751e077c398ca4df93'
     and 'd0cb7283cf7d2781a86b70c369e0f2ea813e7b9c'