Merge branch 'upstream' into tizen
authorLee Chang Yeon <cyeon.lee@samsung.com>
Tue, 8 Apr 2014 10:21:18 +0000 (19:21 +0900)
committerLee Chang Yeon <cyeon.lee@samsung.com>
Tue, 8 Apr 2014 10:21:18 +0000 (19:21 +0900)

Trivial merge