Deal better with externally listed keys
svn path=/branches/kdepim/enterprise4/kdepim/; revision=812756