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)
commitccbad9e034d41f730ee8432f59f36d18d47f5a57
tree15a677404bdc98a1490700d51ff31660acef477c
parent9afe535895977c44c960b3b1df5ea347f227bebe
parent677e68b5c84389537e803c035b658dd18e845c45
Merge ... '113174d33136a54f14b81e89817064146ea7422c'
     and 'b4020cab7dcbd44730c72ed20e7925421b1e65a7'