Merge branch 'upstream' into tizen
authorLee Chang Yeon <cyeon.lee@samsung.com>
Wed, 9 Apr 2014 00:34:57 +0000 (09:34 +0900)
committerLee Chang Yeon <cyeon.lee@samsung.com>
Wed, 9 Apr 2014 00:34:57 +0000 (09:34 +0900)

Trivial merge