merge of '2f874ef26d3d188bdba338d64271407ff2d178e5'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 4 Jan 2007 19:20:44 +0000 (19:20 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 4 Jan 2007 19:20:44 +0000 (19:20 +0000)
     and '5e009cc3f1463fd909ab544e5d857738234928ba'


Trivial merge