From bd887c6624069e69d8fe28e1a0e34b6252a43296 Mon Sep 17 00:00:00 2001
From: Jimmy Shih <jshih@google.com>
Date: Fri, 16 Dec 2011 16:16:08 -0800
Subject: [PATCH] merge heads