Merge branch 'touch' into develop
authorgiwoong.kim <giwoong.kim@samsung.com>
Fri, 17 Feb 2012 02:55:38 +0000 (11:55 +0900)
committergiwoong.kim <giwoong.kim@samsung.com>
Fri, 17 Feb 2012 02:55:39 +0000 (11:55 +0900)
Change-ID: I71eceddc878d661f8839e56c40c6317b287cd7be


Trivial merge