Merge branch 'master' into fixes

author Stefan Schantl <stefan.schantl@ipfire.org>

Sun, 27 Feb 2011 20:21:50 +0000 (21:21 +0100)

committer Stefan Schantl <stefan.schantl@ipfire.org>

Sun, 27 Feb 2011 20:21:50 +0000 (21:21 +0100)
author Stefan Schantl <stefan.schantl@ipfire.org>
Sun, 27 Feb 2011 20:21:50 +0000 (21:21 +0100)
committer Stefan Schantl <stefan.schantl@ipfire.org>
Sun, 27 Feb 2011 20:21:50 +0000 (21:21 +0100)
diff --cc pkgs/X11vnc/X11vnc.nm
Simple merge
diff --cc pkgs/xorg-x11-drv-ati/xorg-x11-drv-ati.nm
Simple merge
diff --cc pkgs/xorg-x11-drv-evdev/xorg-x11-drv-evdev.nm
Simple merge
diff --cc pkgs/xorg-x11-font-utils/xorg-x11-font-utils.nm
Simple merge
diff --cc pkgs/xorg-x11-server/xorg-x11-server.nm
Simple merge
author	Stefan Schantl <stefan.schantl@ipfire.org>
	Sun, 27 Feb 2011 20:21:50 +0000 (21:21 +0100)
committer	Stefan Schantl <stefan.schantl@ipfire.org>
	Sun, 27 Feb 2011 20:21:50 +0000 (21:21 +0100)
		1	2
pkgs/X11vnc/X11vnc.nm	patch \|	diff1 \|	diff2 \|	blob \| history
pkgs/xorg-x11-drv-ati/xorg-x11-drv-ati.nm	patch \|	diff1 \|	diff2 \|	blob \| history
pkgs/xorg-x11-drv-evdev/xorg-x11-drv-evdev.nm	patch \|	diff1 \|	diff2 \|	blob \| history
pkgs/xorg-x11-font-utils/xorg-x11-font-utils.nm	patch \|	diff1 \|	diff2 \|	blob \| history
pkgs/xorg-x11-server/xorg-x11-server.nm	patch \|	diff1 \|	diff2 \|	blob \| history