merge of '49d63989ff625988d6bb90696a2abb7d3fc939bb'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 3 Jan 2008 14:25:02 +0000 (14:25 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 3 Jan 2008 14:25:02 +0000 (14:25 +0000)
     and 'e470e7389a3efbef69e6eb562d9457d642b782a1'


Trivial merge