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)
commit54e1ebf1061d87fb139645426d008f97a97a6c21
treece1c4c0706e84aff605c5871d6a131d1ae47ee2c
parent3615d96b98cb45c801b781b504aa3f9f33c04c26
parentde1ecaba75bda10cc12d638542ec8df695a8d9bf
Merge ... '37a4a98782bda17b384e225dc6561e633f49393c'
     and '8703e298438768d4c30698e05f523d4554ee2c04'