Merge branch 'master' into tizen_2.0
authorJinjin Shi <jinjin.shi@samsung.com>
Sat, 12 Jan 2013 10:16:54 +0000 (18:16 +0800)
committerJinjin Shi <jinjin.shi@samsung.com>
Sat, 12 Jan 2013 10:17:12 +0000 (18:17 +0800)
Change-Id: I6b902d979253f57e0f95ddf5102972ce4aff20b0


Trivial merge