merge of '5fc01752a7d73572c40917d73b0efb4a550c89dc'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 15 Nov 2007 10:47:12 +0000 (10:47 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 15 Nov 2007 10:47:12 +0000 (10:47 +0000)
commitaf449ed7098924951e29ba7b6946e0ef51369d54
treec62dfbe4faba2bd69ce52eb05209250f29c0641f
parent3aba147ba4f4859f58bd39dd71532c835ebecd7a
parentac1744fe39bd54cf7e36eaabfa037b5c68586e3d
Merge ... '5fc01752a7d73572c40917d73b0efb4a550c89dc'
     and 'f94559e4a48c2ae3cd234fdf608f511fc04df7be'