merge of '113174d33136a54f14b81e89817064146ea7422c'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 29 Mar 2007 14:58:57 +0000 (14:58 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 29 Mar 2007 14:58:57 +0000 (14:58 +0000)
     and 'b4020cab7dcbd44730c72ed20e7925421b1e65a7'


Trivial merge