resolved conflicts for merge of 05be6d6f to master

author Dianne Hackborn <hackbod@google.com>

Tue, 10 May 2011 02:00:59 +0000 (19:00 -0700)

committer Dianne Hackborn <hackbod@google.com>

Tue, 10 May 2011 02:00:59 +0000 (19:00 -0700)
author Dianne Hackborn <hackbod@google.com>
Tue, 10 May 2011 02:00:59 +0000 (19:00 -0700)
committer Dianne Hackborn <hackbod@google.com>
Tue, 10 May 2011 02:00:59 +0000 (19:00 -0700)
diff --cc include/ui/Input.h
Simple merge
diff --cc libs/ui/Input.cpp
Simple merge
author	Dianne Hackborn <hackbod@google.com>
	Tue, 10 May 2011 02:00:59 +0000 (19:00 -0700)
committer	Dianne Hackborn <hackbod@google.com>
	Tue, 10 May 2011 02:00:59 +0000 (19:00 -0700)
		1	2
include/ui/Input.h	patch \|	diff1 \|	diff2 \|	blob \| history
libs/ui/Input.cpp	patch \|	diff1 \|	diff2 \|	blob \| history