Merge branch 'develop' into release
authordonghyuk.yang <donghyuk.yang@samsung.com>
Fri, 8 Mar 2013 07:29:28 +0000 (16:29 +0900)
committerdonghyuk.yang <donghyuk.yang@samsung.com>
Fri, 8 Mar 2013 07:29:28 +0000 (16:29 +0900)
Conflicts:
package/changelog
package/pkginfo.manifest


Trivial merge