Merge branch 'master' into tizen_2.1
authorhjnim.kim <hjnim.kim@samsung.com>
Fri, 3 May 2013 06:37:08 +0000 (15:37 +0900)
committerhjnim.kim <hjnim.kim@samsung.com>
Fri, 3 May 2013 06:37:29 +0000 (15:37 +0900)
Change-Id: Ib39c2e5103d8e61bc6251d9987863a7a12720676


Trivial merge