Merge branch 'release' into develop
authorKitae Kim <kt920.kim@samsung.com>
Mon, 17 Sep 2012 04:40:57 +0000 (13:40 +0900)
committerKitae Kim <kt920.kim@samsung.com>
Mon, 17 Sep 2012 04:40:57 +0000 (13:40 +0900)
Conflicts:
package/pkginfo.manifest


Trivial merge