Index: /applications/editors/josm/plugins/FixAddresses/build.xml
===================================================================
--- /applications/editors/josm/plugins/FixAddresses/build.xml	(revision 27823)
+++ /applications/editors/josm/plugins/FixAddresses/build.xml	(revision 27824)
@@ -23,5 +23,5 @@
 <project name="FixAddresses" default="dist" basedir=".">
 	<!-- enter the SVN commit message -->
-	<property name="commit.message" value="Bugfix #7169: Added option to ignore post codes."/>
+	<property name="commit.message" value="fix shortcut conflict, moved fiX to Shift-X"/>
 	
     <!--
Index: /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/FixUnresolvedStreetsAction.java
===================================================================
--- /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/FixUnresolvedStreetsAction.java	(revision 27823)
+++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/FixUnresolvedStreetsAction.java	(revision 27824)
@@ -31,6 +31,5 @@
 				tr("Find and fix addresses without (valid) streets."),
 				Shortcut.registerShortcut("tools:AddressEdit", tr("Tool: {0}",
-				tr("Address Edit")), KeyEvent.VK_A, Shortcut.GROUP_MENU,
-				InputEvent.ALT_DOWN_MASK | InputEvent.SHIFT_DOWN_MASK), false);
+				tr("Address Edit")), KeyEvent.VK_X, Shortcut.GROUP_MENU), false);
 
 		setEnabled(false);