Merge branch 'upstream' into tizen
authorChangyeon Lee <cyeon.lee@samsung.com>
Wed, 9 Apr 2014 02:14:48 +0000 (11:14 +0900)
committerChangyeon Lee <cyeon.lee@samsung.com>
Wed, 9 Apr 2014 02:14:48 +0000 (11:14 +0900)

Trivial merge