Merge remote branch 'common/android-2.6.36' into android-tegra-2.6.36
authorIliyan Malchev <malchev@google.com>
Tue, 7 Dec 2010 02:22:59 +0000 (18:22 -0800)
committerIliyan Malchev <malchev@google.com>
Tue, 7 Dec 2010 02:22:59 +0000 (18:22 -0800)

Trivial merge