Merge branch 'android-2.6.36' into android-tegra-2.6.36
authorIliyan Malchev <malchev@google.com>
Tue, 23 Nov 2010 00:06:23 +0000 (16:06 -0800)
committerIliyan Malchev <malchev@google.com>
Tue, 23 Nov 2010 00:06:27 +0000 (16:06 -0800)
Signed-off-by: Iliyan Malchev <malchev@google.com>

Trivial merge