Merge branch 'master' into imlib2

author Brenden Matthews <brenden@rty.ca>

Sun, 10 May 2009 03:14:39 +0000 (21:14 -0600)

committer Brenden Matthews <brenden@rty.ca>

Sun, 10 May 2009 03:14:39 +0000 (21:14 -0600)
author Brenden Matthews <brenden@rty.ca>
Sun, 10 May 2009 03:14:39 +0000 (21:14 -0600)
committer Brenden Matthews <brenden@rty.ca>
Sun, 10 May 2009 03:14:39 +0000 (21:14 -0600)
diff --cc configure.ac.in
Simple merge
diff --cc src/conky.c
Simple merge
author	Brenden Matthews <brenden@rty.ca>
	Sun, 10 May 2009 03:14:39 +0000 (21:14 -0600)
committer	Brenden Matthews <brenden@rty.ca>
	Sun, 10 May 2009 03:14:39 +0000 (21:14 -0600)
		1	2
configure.ac.in	patch \|	diff1 \|	diff2 \|	blob \| history
src/conky.c	patch \|	diff1 \|	diff2 \|	blob \| history