Merge branch 'master' into tizen_2.0
authorsunil85.kim <sunil85.kim@samsung.com>
Sat, 2 Feb 2013 02:39:20 +0000 (11:39 +0900)
committersunil85.kim <sunil85.kim@samsung.com>
Sat, 2 Feb 2013 02:39:28 +0000 (11:39 +0900)
Change-Id: I1902e6832278edf86d36182dd1596fd6110a825c


Trivial merge