Merge branch 'tizen_2.1'
authorMyoungJune Park <mj2004.park@samsung.com>
Wed, 3 Apr 2013 11:22:37 +0000 (20:22 +0900)
committerMyoungJune Park <mj2004.park@samsung.com>
Wed, 3 Apr 2013 11:22:37 +0000 (20:22 +0900)

Trivial merge