Removes the use of Java 1.6 API (because we target 1.5) reported by Damian Minkov on the dev mailing list in the thread 'Password Storage in trunk'.