Merge branch 'master' into tizen_2.0
authorJinjin Shi <jinjin.shi@samsung.com>
Fri, 21 Dec 2012 13:03:39 +0000 (21:03 +0800)
committerJinjin Shi <jinjin.shi@samsung.com>
Fri, 21 Dec 2012 13:05:53 +0000 (21:05 +0800)
Change-Id: Id3a84c2f9fd78b23dc494c73344d2716612f0e9c


Trivial merge