tree ec74a0a6560f526080d276e5cbeae4f07ce15057
parent 36ccfa6d5fb9ec9f16339a22f3ba7073e0297cd6
author Jukka Zitting <jukka@apache.org> 1164794528 +0000
committer Jukka Zitting <jukka@apache.org> 1164794528 +0000

branches/1.1: Fixed a merge error

git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/branches/1.1@480505 13f79535-47bb-0310-9956-ffa450edef68