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)
     and 'f94559e4a48c2ae3cd234fdf608f511fc04df7be'


Trivial merge