Merge branch 'android-tegra-2.6.36' into android-tegra-moto-2.6.36
authorDima Zavin <dima@android.com>
Mon, 8 Nov 2010 23:00:31 +0000 (15:00 -0800)
committerDima Zavin <dima@android.com>
Mon, 8 Nov 2010 23:00:31 +0000 (15:00 -0800)

Trivial merge