Merge with stable
authorMartin Geisler <mg@lazybytes.net>
Mon, 30 Nov 2009 23:27:37 +0100
changeset 9968 8c923a18e7ae
parent 9965 963ed04a8fde (current diff)
parent 9967 0c3eeee91c9a (diff)
child 9969 361bee1ec172
Merge with stable