Merge "Merge branch 'master' into tizen_2.1" into tizen_2.1
authorMyoungJune Park <mj2004.park@samsung.com>
Mon, 15 Apr 2013 05:44:06 +0000 (14:44 +0900)
committerGerrit Code Review <gerrit2@kim11>
Mon, 15 Apr 2013 05:44:06 +0000 (14:44 +0900)

Trivial merge