Merge branch 'master' into tizen_2.0
authorJaeyun Jeong <jyjeong@samsung.com>
Tue, 8 Jan 2013 13:04:37 +0000 (22:04 +0900)
committerJaeyun Jeong <jyjeong@samsung.com>
Tue, 8 Jan 2013 13:04:37 +0000 (22:04 +0900)

Trivial merge