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)
commit39e6582b3f2f45defdd5a2de4437764d9b315a6d
treec253953489e6cbaf408bbfd261a6402d110bb09f
parent1ef3812e32fdedb8c7a7f297578bd009d02834ec
parentd9eb64a436c4ddfe30ba5454d1becd765c3cb7d5
Merge ... '1479b8771eb7ed5d675e3c565d67c40c2030888c'
     and 'a81be4a9e6a337df1765dd0899498f17ec68c272'