Merge r947833 from trunk.

Dealt with conflicts in deadprops.c since the save_value function
has been refactored.


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x-r947833@1461955 13f79535-47bb-0310-9956-ffa450edef68