merge of '0fb6c6e17d53f8f9619779a7259b3225d01cf28d'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 5 Dec 2007 17:50:18 +0000 (17:50 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 5 Dec 2007 17:50:18 +0000 (17:50 +0000)
     and '1a6625be75631d7dfb75413cb256eef5afb4d507'


Trivial merge