merge of '381386545295748802d49e020def79338aa8d301'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 7 Mar 2008 10:47:25 +0000 (10:47 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 7 Mar 2008 10:47:25 +0000 (10:47 +0000)
     and '49e647037a07cbb223a15ef77511f87636080be4'


Trivial merge