Merge remote-tracking branch 'finepoint/master' into add_with-libnl_switch

author Michael Richardson <[email protected]>

Wed, 6 Aug 2014 06:02:08 +0000 (02:02 -0400)

committer Michael Richardson <[email protected]>

Wed, 6 Aug 2014 06:02:08 +0000 (02:02 -0400)
author Michael Richardson <[email protected]>
Wed, 6 Aug 2014 06:02:08 +0000 (02:02 -0400)
committer Michael Richardson <[email protected]>
Wed, 6 Aug 2014 06:02:08 +0000 (02:02 -0400)
diff --cc configure
Simple merge
diff --cc configure.in
Simple merge
author	Michael Richardson <[email protected]>
	Wed, 6 Aug 2014 06:02:08 +0000 (02:02 -0400)
committer	Michael Richardson <[email protected]>
	Wed, 6 Aug 2014 06:02:08 +0000 (02:02 -0400)
		1	2
configure	patch \|	diff1 \|	diff2 \|	blob \| history
configure.in	patch \|	diff1 \|	diff2 \|	blob \| history