Merge branch 'merge' into tizen_2.1 tizen_2.1 accepted/tizen/20130520.101609 submit/tizen/20130517.045637 submit/tizen_2.1/20130514.055255
authorhjnim.kim <hjnim.kim@samsung.com>
Fri, 10 May 2013 05:50:45 +0000 (14:50 +0900)
committerhjnim.kim <hjnim.kim@samsung.com>
Fri, 10 May 2013 05:50:45 +0000 (14:50 +0900)

Trivial merge