Merge branch 'private-develop' into develop
authorTaeyoung Son <taeyoung2.son@samsung.com>
Wed, 1 Aug 2012 08:51:56 +0000 (17:51 +0900)
committerTaeyoung Son <taeyoung2.son@samsung.com>
Wed, 1 Aug 2012 08:51:56 +0000 (17:51 +0900)
Conflicts:
package/build.linux
package/pkginfo.manifest


Trivial merge