Merging changes from 2.0.4 release back into 2.0.X trunk.


git-svn-id: https://svn.apache.org/repos/asf/lenya/branches/BRANCH_2_0_X@1072598 13f79535-47bb-0310-9956-ffa450edef68
3 files changed