Merge branch 'master' into tizen_2.0
authorKim Jinho <jinho912.kim@samsung.com>
Tue, 29 Jan 2013 05:38:35 +0000 (14:38 +0900)
committerKim Jinho <jinho912.kim@samsung.com>
Tue, 29 Jan 2013 05:38:35 +0000 (14:38 +0900)

Trivial merge