merge of '686e9c3c9548df9c0c138bec3dbfc29bd7d8c301'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 18 Oct 2007 14:02:56 +0000 (14:02 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 18 Oct 2007 14:02:56 +0000 (14:02 +0000)
     and '9ad4a40895cac3d0144289560f4f5fc76596d11a'


Trivial merge