Merge branch 'develop' into release
authordonghyuk.yang <donghyuk.yang@samsung.com>
Mon, 17 Dec 2012 07:38:39 +0000 (16:38 +0900)
committerdonghyuk.yang <donghyuk.yang@samsung.com>
Mon, 17 Dec 2012 07:39:01 +0000 (16:39 +0900)
commit5324eeb5f2f8c7da93e7698c01349545153b53a3
treef1cc821528dc4ec42b011e75155105e21d0d77d5
parent1597b99c917afb8a92977d8db0036d7000c4fba8
parent31de4300c37a15fecd56cedbe0eada801ff96238
Merge branch 'develop' into release

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