merge from open-source master

author Jean-Baptiste Queru <jbq@google.com>

Mon, 9 Nov 2009 00:09:17 +0000 (16:09 -0800)

committer Jean-Baptiste Queru <jbq@google.com>

Mon, 9 Nov 2009 00:09:17 +0000 (16:09 -0800)
author Jean-Baptiste Queru <jbq@google.com>
Mon, 9 Nov 2009 00:09:17 +0000 (16:09 -0800)
committer Jean-Baptiste Queru <jbq@google.com>
Mon, 9 Nov 2009 00:09:17 +0000 (16:09 -0800)
diff --cc libc/Android.mk
Simple merge
diff --cc linker/dlfcn.c
Simple merge
diff --cc linker/linker.c
Simple merge
diff --cc linker/linker.h
Simple merge
author	Jean-Baptiste Queru <jbq@google.com>
	Mon, 9 Nov 2009 00:09:17 +0000 (16:09 -0800)
committer	Jean-Baptiste Queru <jbq@google.com>
	Mon, 9 Nov 2009 00:09:17 +0000 (16:09 -0800)
		1	2
libc/Android.mk	patch \|	diff1 \|	diff2 \|	blob \| history
linker/dlfcn.c	patch \|	diff1 \|	diff2 \|	blob \| history
linker/linker.c	patch \|	diff1 \|	diff2 \|	blob \| history
linker/linker.h	patch \|	diff1 \|	diff2 \|	blob \| history