Dharma_beta2
7d4054e9 · merged: r33346, r33351 from trunk. ·