merge of '353324dd9a65b594eaee01782ae8aa085ae87b9a'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 15 Nov 2007 14:21:12 +0000 (14:21 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 15 Nov 2007 14:21:12 +0000 (14:21 +0000)
     and '5a50d1d54a36230e32c94701cae6d541b1ff2707'


Trivial merge