Merge "P120829-5684" into 2.0_beta
authorkairong yin <kairong78.yin@tizendev.org>
Fri, 31 Aug 2012 05:24:17 +0000 (14:24 +0900)
committerGerrit Code Review <gerrit2@localhost>
Fri, 31 Aug 2012 05:24:17 +0000 (14:24 +0900)

Trivial merge