Merge branch 'master' into scan-test

author Johannes Berg <johannes@sipsolutions.net>

Thu, 29 Jan 2009 13:42:58 +0000 (14:42 +0100)

committer Johannes Berg <johannes@sipsolutions.net>

Thu, 29 Jan 2009 13:42:58 +0000 (14:42 +0100)
author Johannes Berg <johannes@sipsolutions.net>
Thu, 29 Jan 2009 13:42:58 +0000 (14:42 +0100)
committer Johannes Berg <johannes@sipsolutions.net>
Thu, 29 Jan 2009 13:42:58 +0000 (14:42 +0100)
diff --cc Makefile
Simple merge
diff --cc info.c
Simple merge
author	Johannes Berg <johannes@sipsolutions.net>
	Thu, 29 Jan 2009 13:42:58 +0000 (14:42 +0100)
committer	Johannes Berg <johannes@sipsolutions.net>
	Thu, 29 Jan 2009 13:42:58 +0000 (14:42 +0100)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
info.c	patch \|	diff1 \|	diff2 \|	blob \| history