Merge remote branch 'common/android-2.6.36' into android-tegra-2.6.36
authorDima Zavin <dima@android.com>
Thu, 11 Nov 2010 23:31:45 +0000 (15:31 -0800)
committerDima Zavin <dima@android.com>
Thu, 11 Nov 2010 23:31:45 +0000 (15:31 -0800)

Trivial merge