Merge branch 'master' into 3.4-working

author Dana Jansens <danakj@orodu.net>

Sat, 21 Jul 2007 00:51:14 +0000 (20:51 -0400)

committer Dana Jansens <danakj@orodu.net>

Sat, 21 Jul 2007 00:51:14 +0000 (20:51 -0400)
author Dana Jansens <danakj@orodu.net>
Sat, 21 Jul 2007 00:51:14 +0000 (20:51 -0400)
committer Dana Jansens <danakj@orodu.net>
Sat, 21 Jul 2007 00:51:14 +0000 (20:51 -0400)
diff --cc openbox/config.c
Simple merge
diff --cc openbox/frame.c
Simple merge
author	Dana Jansens <danakj@orodu.net>
	Sat, 21 Jul 2007 00:51:14 +0000 (20:51 -0400)
committer	Dana Jansens <danakj@orodu.net>
	Sat, 21 Jul 2007 00:51:14 +0000 (20:51 -0400)
		1	2
openbox/config.c	patch \|	diff1 \|	diff2 \|	blob \| history
openbox/frame.c	patch \|	diff1 \|	diff2 \|	blob \| history