Merge branch 'develop' into internal_release
authorsungmin ha <sungmin82.ha@samsung.com>
Fri, 6 Jul 2012 12:33:28 +0000 (21:33 +0900)
committersungmin ha <sungmin82.ha@samsung.com>
Fri, 6 Jul 2012 12:33:28 +0000 (21:33 +0900)
Conflicts:
package/pkginfo.manifest


Trivial merge