Merge branch 'sh/master'
authorFlorian Forster <octo@huhu.verplant.org>
Wed, 22 Aug 2007 14:36:10 +0000 (16:36 +0200)
committerFlorian Forster <octo@huhu.verplant.org>
Wed, 22 Aug 2007 14:36:10 +0000 (16:36 +0200)
commit66ade8b7294e88030555575fdba4e90867f62599
tree8f796cd824be5978ff1d7ff3ba4797f4f4602156
parent1ec7adf09a1df8b4b38330869c95a12eca15017a
parent7fb30eb66bae170357dc3b568ff1934ad9ed2c2d
Merge branch 'sh/master'

Conflicts:

configure.in