Merge branch 'internal_release' into develop
authorjihye kim <jihye1128.kim@samsung.com>
Wed, 4 Jul 2012 02:29:56 +0000 (11:29 +0900)
committerjihye kim <jihye1128.kim@samsung.com>
Wed, 4 Jul 2012 02:29:56 +0000 (11:29 +0900)
commit19fcc73a31e9e98444fc9a1d5be1f8ab2554ccc5
tree46c9259c60adb70bfb0f03d565bb32d4c14722a4
parent480a45ff6cddc58ef4f8654daeee138fc88e7c35
parent84746650eaccc6edd54d4573bdefaf24339af626
Merge branch 'internal_release' into develop

Conflicts:
package/pkginfo.manifest