Reverted some unwanted changes back to the trunk version (e.g. AvalonEdit shouldn't reference Core.Presentation).
I'm committing the result of the merge as a new branch because the shortcuts integration breaks some menus.
git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/branches/shortcuts2@5231 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61