merge of '2f655855e9cd21f0db11577a04d65162273a4b1c'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 3 Jan 2007 12:30:36 +0000 (12:30 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 3 Jan 2007 12:30:36 +0000 (12:30 +0000)
commit4601ad28765bf7ef207974f9ad7fc209d3745088
tree7606ec3468f5377ea19776cf43227427582ce410
parentd9a54a4705d13b90f074817368059cb8b0f20f20
parentef937c49f30fa5b7c6656c7f9814cb1fb161e070
Merge ... '2f655855e9cd21f0db11577a04d65162273a4b1c'
     and '7754c88af17176a35aedbbe47eeab2d9d5d7774b'