Merge branch 'master' into tizen_2.1
authorMyoungJune Park <mj2004.park@samsung.com>
Mon, 8 Apr 2013 14:17:04 +0000 (23:17 +0900)
committerMyoungJune Park <mj2004.park@samsung.com>
Mon, 8 Apr 2013 14:17:04 +0000 (23:17 +0900)

Trivial merge