Merge with stable
authorMartin Geisler <mg@lazybytes.net>
Wed, 30 Dec 2009 20:59:23 +0100
changeset 10170 910196cdfa9c
parent 10169 e78a62551586 (current diff)
parent 10168 4feae34a287a (diff)
child 10171 542279f81203
Merge with stable