merge with latest code
authorYong Yeon Kim <yy9875.kim@samsung.com>
Mon, 10 Jun 2013 05:55:12 +0000 (14:55 +0900)
committerYong Yeon Kim <yy9875.kim@samsung.com>
Mon, 10 Jun 2013 05:55:12 +0000 (14:55 +0900)

Trivial merge