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

Trivial merge