Merge branch 'backport' into 3.4-working

author Dana Jansens <danakj@orodu.net>

Sat, 21 Nov 2009 21:56:17 +0000 (16:56 -0500)

committer Dana Jansens <danakj@orodu.net>

Sat, 21 Nov 2009 21:56:17 +0000 (16:56 -0500)
author Dana Jansens <danakj@orodu.net>
Sat, 21 Nov 2009 21:56:17 +0000 (16:56 -0500)
committer Dana Jansens <danakj@orodu.net>
Sat, 21 Nov 2009 21:56:17 +0000 (16:56 -0500)
diff --cc openbox/actions/moveresizeto.c
Simple merge
diff --cc openbox/client.c
Simple merge
diff --cc openbox/client.h
Simple merge
diff --cc openbox/frame.c
Simple merge
author	Dana Jansens <danakj@orodu.net>
	Sat, 21 Nov 2009 21:56:17 +0000 (16:56 -0500)
committer	Dana Jansens <danakj@orodu.net>
	Sat, 21 Nov 2009 21:56:17 +0000 (16:56 -0500)
		1	2
openbox/actions/moveresizeto.c	patch \|	diff1 \|	diff2 \|	blob \| history
openbox/client.c	patch \|	diff1 \|	diff2 \|	blob \| history
openbox/client.h	patch \|	diff1 \|	diff2 \|	blob \| history
openbox/frame.c	patch \|	diff1 \|	diff2 \|	blob \| history