merge of '1d9afcd1f3d90ea7abf5cfc1915392bf9edb076d'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 27 Aug 2007 11:28:05 +0000 (11:28 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 27 Aug 2007 11:28:05 +0000 (11:28 +0000)
     and '26b8940ca9869ff7c4b384c11ddddffb98dc101d'


Trivial merge