Merge branch 'develop' into release
authordonghee yang <donghee.yang@samsung.com>
Fri, 31 Aug 2012 09:21:44 +0000 (18:21 +0900)
committerdonghee yang <donghee.yang@samsung.com>
Fri, 31 Aug 2012 09:21:44 +0000 (18:21 +0900)
commitf9be1c04d5e6093e472cf5d39bce83c525db2d07
tree231b1b5d87c5956ad1ae7581be7e1ba696facca3
parentc187e9f8eea3c80093afd4cbbc2bcc78a2f5a066
parent6ac29737835510b3ec83b6eb47c932a1bca30742
Merge branch 'develop' into release

Conflicts:
package/pkginfo.manifest
package/pkginfo.manifest