merge of '9e29945dfdbfc2fec2c1df2f2690b9e3a59ae6d0'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 4 Apr 2007 20:01:33 +0000 (20:01 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 4 Apr 2007 20:01:33 +0000 (20:01 +0000)
     and 'bb678746461a120f0e199de2782ede836dc1b795'


Trivial merge