merge of '9d487e0e820ff337d6de3af6ade625bea99a13f0'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 30 Oct 2007 18:45:18 +0000 (18:45 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 30 Oct 2007 18:45:18 +0000 (18:45 +0000)
     and 'f4f4fd93a0ba107d720385c50418ba1e95de7e91'


Trivial merge