Merge branch 'master' into tizen_2.0
authorKim Jinho <jinho912.kim@samsung.com>
Wed, 23 Jan 2013 06:04:59 +0000 (15:04 +0900)
committerKim Jinho <jinho912.kim@samsung.com>
Wed, 23 Jan 2013 06:04:59 +0000 (15:04 +0900)

Trivial merge