Merge with stable
authorMartin Geisler <mg@aragost.com>
Fri, 02 Jul 2010 11:30:57 +0200
changeset 11493 cc4e2a7ca23f
parent 11428 8b452fe4bf50 (diff)
parent 11469 c37f35d7f2f5 (current diff)
child 11494 2347513f562a
Merge with stable