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)
commit10d893a6cb0031848f51da495c6780b4070d2441
tree3148d6a2e8798121f8efa03dc42500533379aea3
parentde7e9797dde536f430ffce0f736d2c90b9ff3b9c
parenta7dbe6c6e1a836c3df6bf18487e395e5f06012cd
Merge branch 'private-develop' into develop

Conflicts:
package/build.linux
package/pkginfo.manifest