Merging dev/datepicker with latest trunk

There were changes to ui.datepicker.js both in trunk (since creating
the branch from revision 2589) and in dev/datepicker. I'm unable to
merge them. Can someone handle that? Ca-Phun?
Jörn