Merge branch 'master' into 1.7_branch

This commit is contained in:
Reinier Balt 2009-01-08 10:19:34 +01:00
commit 083895dc33

@ -1 +1 @@
Subproject commit 72324cf592892daf9df56961dbdc2c036a2a3ca9
Subproject commit d3746adc39333f056f14969d40aa1f0072eb4eed