merge of '52b8f41a965e291eede4b4094b41d82b1b115c2f'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 26 Apr 2007 19:45:19 +0000 (19:45 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 26 Apr 2007 19:45:19 +0000 (19:45 +0000)
     and '8a96b7a7e6f32d11685d21a5c12d5420a27e8110'


Trivial merge