Merge branch 'master' into tizen_2.0
authorKim Gibyoung <lastkgb.kim@samsung.com>
Thu, 31 Jan 2013 18:36:40 +0000 (03:36 +0900)
committerKim Gibyoung <lastkgb.kim@samsung.com>
Thu, 31 Jan 2013 18:36:46 +0000 (03:36 +0900)
Change-Id: Ia654d01a79e3f45804b939c3e691ddcc4cc65df0


Trivial merge