merge of '4c707078f812ad92fe59bccdba4b732c19d86f58'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 19 Dec 2007 13:32:31 +0000 (13:32 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 19 Dec 2007 13:32:31 +0000 (13:32 +0000)
     and 'b7b67f6048fe2a820cabbf8ef59a12d38cd266dc'


Trivial merge