Pick up lost changes from submit/tizen/20130710.103011 accepted/tizen/20130717.234756 submit/tizen/20130717.214210
authorGraydon, Tracy <tracy.graydon@intel.com>
Wed, 17 Jul 2013 21:41:00 +0000 (14:41 -0700)
committerGraydon, Tracy <tracy.graydon@intel.com>
Wed, 17 Jul 2013 21:41:00 +0000 (14:41 -0700)

Trivial merge