Merge branch 'master' into tizen_2.1
authorKim Gibyoung <lastkgb.kim@samsung.com>
Fri, 3 May 2013 10:48:34 +0000 (19:48 +0900)
committerKim Gibyoung <lastkgb.kim@samsung.com>
Fri, 3 May 2013 10:48:38 +0000 (19:48 +0900)
Change-Id: I21f7a3d4f1cb55040d3ebbe9fcdc5d017bbe90b1


Trivial merge