Merge branch 'master' into tizen_2.1
authorKim Gibyoung <lastkgb.kim@samsung.com>
Wed, 3 Apr 2013 08:32:51 +0000 (17:32 +0900)
committerKim Gibyoung <lastkgb.kim@samsung.com>
Wed, 3 Apr 2013 08:36:05 +0000 (17:36 +0900)
Change-Id: I0bb180bf24581a65461bcc624618e0a998a3eb77


Trivial merge