merge of '5825a3b31a4da8bd899bac6fef5c9f16e34dc883'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 3 Aug 2007 11:16:04 +0000 (11:16 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 3 Aug 2007 11:16:04 +0000 (11:16 +0000)
     and '8d78f48d5027db6d0772303acb59044c4fbcfdbb'


Trivial merge