Merge branch 'master' into tizen_2.0
authorsunil85.kim <sunil85.kim@samsung.com>
Mon, 21 Jan 2013 03:25:04 +0000 (12:25 +0900)
committersunil85.kim <sunil85.kim@samsung.com>
Mon, 21 Jan 2013 03:25:09 +0000 (12:25 +0900)
Change-Id: I33e6c871bbaa926a0ad8bd781e7d3b3d3f79dd06


Trivial merge