merge of '1479b8771eb7ed5d675e3c565d67c40c2030888c'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 23 Aug 2007 11:30:25 +0000 (11:30 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 23 Aug 2007 11:30:25 +0000 (11:30 +0000)
     and 'a81be4a9e6a337df1765dd0899498f17ec68c272'


Trivial merge