Merge branch 'origin'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 22 Jul 2006 20:38:29 +0000 (22:38 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 22 Jul 2006 20:38:29 +0000 (22:38 +0200)
commit533dba5626961fae399a4523837bdf7523692e78
tree3a8674678b27f3e63c2e25507daf932d606c8261
parentb75b88c7dcb5e648dbc4bec2e2fbbaa3778b78b4
parentdf6f5e387b589b665f3be9099f6a27a84a805e09
Merge branch 'origin'