Merge commit 'lumag/master'

author Michael Richardson <[email protected]>

Thu, 13 May 2010 17:52:46 +0000 (13:52 -0400)

committer Michael Richardson <[email protected]>

Thu, 13 May 2010 17:52:46 +0000 (13:52 -0400)
author Michael Richardson <[email protected]>
Thu, 13 May 2010 17:52:46 +0000 (13:52 -0400)
committer Michael Richardson <[email protected]>
Thu, 13 May 2010 17:52:46 +0000 (13:52 -0400)
diff --cc Makefile.in
Simple merge
diff --cc addrtoname.c
Simple merge
author	Michael Richardson <[email protected]>
	Thu, 13 May 2010 17:52:46 +0000 (13:52 -0400)
committer	Michael Richardson <[email protected]>
	Thu, 13 May 2010 17:52:46 +0000 (13:52 -0400)
		1	2
Makefile.in	patch \|	diff1 \|	diff2 \|	blob \| history
addrtoname.c	patch \|	diff1 \|	diff2 \|	blob \| history