For eons I've been using PasswordSafe - its worked for me on all platforms.
I'm not sure exactly why - I just wasn't completely happy - so I checked out the competition again. KeePass is something I've always meant to check out - finally did.
Here is a nice little perl script to convert your old PasswordSafe files to KeePassX xml format -
hereMerging can be a bit of fun - you might have a few different machines that get out of sync for eg. This
XSLTProc technique / script isn't perfecto but it's pretty good for 95% - here is
another.
Of course, you could also use diff - that often works.
And even better for you iphone fanpeoples -
iKeepass is due out of alpha sometime when this guy has finished having a life!