Merge branch 'master' into tizen_2.0
authorKim Gibyoung <lastkgb.kim@samsung.com>
Fri, 25 Jan 2013 12:30:04 +0000 (21:30 +0900)
committerKim Gibyoung <lastkgb.kim@samsung.com>
Fri, 25 Jan 2013 12:30:07 +0000 (21:30 +0900)
Change-Id: Ia46e1d840378db0f4c34a202e78ff685011066b6


Trivial merge