Merge commit 'refs/merge-requests/10' of git://gitorious.org/procps/procps into merge...

author Craig Small <csmall@enc.com.au>

Sun, 7 Apr 2013 07:58:06 +0000 (17:58 +1000)

committer Craig Small <csmall@enc.com.au>

Sun, 7 Apr 2013 07:58:06 +0000 (17:58 +1000)
author Craig Small <csmall@enc.com.au>
Sun, 7 Apr 2013 07:58:06 +0000 (17:58 +1000)
committer Craig Small <csmall@enc.com.au>
Sun, 7 Apr 2013 07:58:06 +0000 (17:58 +1000)
diff --cc pmap.c
Simple merge
diff --cc sysctl.c
Simple merge
author	Craig Small <csmall@enc.com.au>
	Sun, 7 Apr 2013 07:58:06 +0000 (17:58 +1000)
committer	Craig Small <csmall@enc.com.au>
	Sun, 7 Apr 2013 07:58:06 +0000 (17:58 +1000)
		1	2
pmap.c	patch \|	diff1 \|	diff2 \|	blob \| history
sysctl.c	patch \|	diff1 \|	diff2 \|	blob \| history