Merge "Sync code from Tizen:Mobile"
authorAuke Kok <auke-jan.h.kok@intel.com>
Wed, 6 Jun 2012 19:35:54 +0000 (04:35 +0900)
committerGerrit Code Review <gerrit2@localhost>
Wed, 6 Jun 2012 19:35:54 +0000 (04:35 +0900)

Trivial merge