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)
commit7e9c2914075e76a0e501dbb7b3ec1bbaa6218483
tree6b281fb48c7fb3d151303e8169f01f7a53c29a7d
parent40346ca680be06af80999e2faa84aab940c2d6ff
parent5bd5c702a3cd8c739de286103a66df115b5a9f7b
Merge branch 'develop' into internal_release

Conflicts:
package/pkginfo.manifest