Merge branch 'release-pre1.0' into develop
authorgiwoong.kim <giwoong.kim@samsung.com>
Tue, 27 Mar 2012 05:56:06 +0000 (14:56 +0900)
committergiwoong.kim <giwoong.kim@samsung.com>
Tue, 27 Mar 2012 05:56:06 +0000 (14:56 +0900)
commit1d716c57066b4a0e0508e95d91e5d8b498da5e63
tree2210205d5120ef28301d95246efcbc2df4733f11
parent9c1403eb617df96bea03c85689294b61b288c808
parent6ec348dd2111ae09fe72a3e8573b994a71d18e5b
Merge branch 'release-pre1.0' into develop

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