Merge branch 'master' into chaz

Conflicts:
	openbox/moveresize.c

diff --cc configure.ac
Simple merge

diff --cc data/rc.xml
Simple merge

diff --cc data/rc.xsd
Simple merge

diff --cc openbox/client.c
Simple merge

diff --cc openbox/client.h
Simple merge

diff --cc openbox/config.c
Simple merge

diff --cc openbox/config.h
Simple merge

diff --cc openbox/frame.c
Simple merge

diff --cc openbox/moveresize.c
index ffed909315037ae4b6882f92b391dbc3b0dc8a7d,333a1bea5ff3563f35d45ddc7358dc0015a57d11..a8965570b10c22de31cb0b9269ae4bcf1ff0c022
--- 1/openbox/moveresize.c
--- 2/openbox/moveresize.c
+++ b/openbox/moveresize.c
@@@ -582,19 -586,19 +586,19 @@@ static void edge_warp_move_ptr(void
      a = screen_physical_area_all_monitors();
  
      switch (edge_warp_dir) {
-       case OB_DIRECTION_NORTH:
-           y = a->height - 2;
-           break;
-       case OB_DIRECTION_EAST:
-           x = a->x + 1;
-           break;
-       case OB_DIRECTION_SOUTH:
-           y = a->y + 1;
-           break;
-       case OB_DIRECTION_WEST:
-           x = a->width - 2;
-           break;
-       default:
+     case OB_DIRECTION_NORTH:
 -        y = a->height - 1;
++        y = a->height - 2;
+         break;
+     case OB_DIRECTION_EAST:
 -        x = a->x;
++        x = a->x + 1;
+         break;
+     case OB_DIRECTION_SOUTH:
 -        y = a->y;
++        y = a->y + 1;
+         break;
+     case OB_DIRECTION_WEST:
 -        x = a->width - 1;
++        x = a->width - 2;
+         break;
+     default:
          g_assert_not_reached();
      }