Merge branch 'backport' into work

author Dana Jansens <danakj@orodu.net>

Tue, 26 Feb 2008 08:15:21 +0000 (03:15 -0500)

committer Dana Jansens <danakj@orodu.net>

Tue, 26 Feb 2008 08:15:21 +0000 (03:15 -0500)
author Dana Jansens <danakj@orodu.net>
Tue, 26 Feb 2008 08:15:21 +0000 (03:15 -0500)
committer Dana Jansens <danakj@orodu.net>
Tue, 26 Feb 2008 08:15:21 +0000 (03:15 -0500)
diff --cc openbox/event.c
Simple merge
diff --cc openbox/mouse.c
Simple merge
author	Dana Jansens <danakj@orodu.net>
	Tue, 26 Feb 2008 08:15:21 +0000 (03:15 -0500)
committer	Dana Jansens <danakj@orodu.net>
	Tue, 26 Feb 2008 08:15:21 +0000 (03:15 -0500)
		1	2
openbox/event.c	patch \|	diff1 \|	diff2 \|	blob \| history
openbox/mouse.c	patch \|	diff1 \|	diff2 \|	blob \| history