Integrated snow related patches of the trunk (r6402 and r6523). Weak changes in sowy areas with a 5d test.