merge of '56ae59ea3e6391be0130df66270147e0cbb86d32'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 27 Sep 2006 14:57:35 +0000 (14:57 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 27 Sep 2006 14:57:35 +0000 (14:57 +0000)
     and '7129200468ce50196cd24e59a5bbb32bb2437726'


Trivial merge