Redo merge with Waqas' PBKDF2 optimizations.
authorTobias Markmann <tm@ayena.de>
Thu, 3 Dec 2009 20:57:47 +0000 (21:57 +0100)
committerTobias Markmann <tm@ayena.de>
Thu, 3 Dec 2009 20:57:47 +0000 (21:57 +0100)

Trivial merge