Merge branch 'develop' into release
authordonghyuk.yang <donghyuk.yang@samsung.com>
Fri, 22 Feb 2013 06:57:49 +0000 (15:57 +0900)
committerdonghyuk.yang <donghyuk.yang@samsung.com>
Fri, 22 Feb 2013 06:57:49 +0000 (15:57 +0900)
commit1ed53da63502f45d6addea894333eea9ee835bd8
treee8299da6050d3d6ba491bc4aaa1b301c2eb0c443
parent9818941ef379c14b5bb6955a67f1b32afc5735d4
parentd1e7604a8a38bde552aceb2737314189e26f2a79
Merge branch 'develop' into release

Conflicts:
package/changelog
package/pkginfo.manifest