Merge branch 'maint'
authorStefano Lattarini <stefano.lattarini@gmail.com>
Mon, 11 Apr 2011 15:08:01 +0000 (17:08 +0200)
committerStefano Lattarini <stefano.lattarini@gmail.com>
Mon, 11 Apr 2011 15:08:01 +0000 (17:08 +0200)
commit08ebcd3a83e37fc1522a11bd906e6c802b022468
tree46586adc018ee07364d50fa6cb4b4595fca59bf4
parentb39dba3923a103103387e099fe4799e080edadf0
parentac6764da0c0ad499e51a36db0a818b03b697ef37
Merge branch 'maint'