Merge branch 'master' into next

author Andre Noll <maan@systemlinux.org>

Sun, 6 Sep 2009 20:23:58 +0000 (22:23 +0200)

committer Andre Noll <maan@systemlinux.org>

Sun, 6 Sep 2009 20:23:58 +0000 (22:23 +0200)
author Andre Noll <maan@systemlinux.org>
Sun, 6 Sep 2009 20:23:58 +0000 (22:23 +0200)
committer Andre Noll <maan@systemlinux.org>
Sun, 6 Sep 2009 20:23:58 +0000 (22:23 +0200)
diff --cc filter.c
Simple merge
diff --cc mood.c
Simple merge
author	Andre Noll <maan@systemlinux.org>
	Sun, 6 Sep 2009 20:23:58 +0000 (22:23 +0200)
committer	Andre Noll <maan@systemlinux.org>
	Sun, 6 Sep 2009 20:23:58 +0000 (22:23 +0200)
		1	2
filter.c	patch \|	diff1 \|	diff2 \|	blob \| history
mood.c	patch \|	diff1 \|	diff2 \|	blob \| history