Merge branch 'upstream' into tizen submit/tizen/20141008.003838
authorJoone Hur <joone.hur@intel.com>
Wed, 8 Oct 2014 00:32:12 +0000 (17:32 -0700)
committerJoone Hur <joone.hur@intel.com>
Wed, 8 Oct 2014 00:32:12 +0000 (17:32 -0700)

Trivial merge