Merge branch 'master' into tizen_2.0
authorKim Jinho <jinho912.kim@samsung.com>
Fri, 25 Jan 2013 09:24:22 +0000 (18:24 +0900)
committerKim Jinho <jinho912.kim@samsung.com>
Fri, 25 Jan 2013 09:24:22 +0000 (18:24 +0900)

Trivial merge