Merge with stable
authorMartin Geisler <mg@lazybytes.net>
Wed, 17 Feb 2010 23:10:22 +0100
changeset 10497 74331292e230
parent 10478 ed4de30e16c5 (diff)
parent 10496 45734b51c99b (current diff)
child 10512 261cc6b0f15c
Merge with stable