Merge branch 'upstream' into tizen
authorJoone Hur <joone.hur@intel.com>
Fri, 3 Oct 2014 06:21:27 +0000 (23:21 -0700)
committerJoone Hur <joone.hur@intel.com>
Fri, 3 Oct 2014 06:21:27 +0000 (23:21 -0700)

Trivial merge