Merge branch 'upstream'
authorGilles Filippini <gilles.filippini@free.fr>
Thu, 18 Jun 2009 20:40:00 +0000 (22:40 +0200)
committerGilles Filippini <gilles.filippini@free.fr>
Thu, 18 Jun 2009 20:40:00 +0000 (22:40 +0200)
commita4cc4da97c05d5f185528ce0e924a261adc60a40
tree812ca944360ff0ba67e686cf663ac15470e907ca
parentb0c24f0a6b80792b4f14b28bf0875b362d7190a6
parent28ab90d774ab2e16b29cd4f246ba189c019be94e
Merge branch 'upstream'