merge of '37a4a98782bda17b384e225dc6561e633f49393c'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 10 Jul 2007 14:33:22 +0000 (14:33 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 10 Jul 2007 14:33:22 +0000 (14:33 +0000)
     and '8703e298438768d4c30698e05f523d4554ee2c04'


Trivial merge