Merge branch 'master' into tizen_2.1
authorKim Gibyoung <lastkgb.kim@samsung.com>
Tue, 2 Apr 2013 10:40:09 +0000 (19:40 +0900)
committerKim Gibyoung <lastkgb.kim@samsung.com>
Tue, 2 Apr 2013 10:41:01 +0000 (19:41 +0900)
Change-Id: I4b952aec81c51e1772887809222fb57085107ab9


Trivial merge