Merge "changes" 16/1916/2 accepted/trunk/20121003.173606 submit/trunk/20121003.174953
authorTracy Graydon <tracy.graydon@intel.com>
Wed, 3 Oct 2012 17:38:03 +0000 (02:38 +0900)
committerGerrit Code Review <gerrit2@gerrit.vlan204.tizen.org>
Wed, 3 Oct 2012 17:38:03 +0000 (02:38 +0900)

Trivial merge