Merge branch 'develop' into release
authorjihye kim <jihye1128.kim@samsung.com>
Mon, 26 Nov 2012 07:09:19 +0000 (16:09 +0900)
committerjihye kim <jihye1128.kim@samsung.com>
Mon, 26 Nov 2012 07:09:19 +0000 (16:09 +0900)
commit78ca0296bb3936250d180eaf93d6d754e2820785
tree569eec492772f8f87e160918edb90a172f898f09
parent0a4eadae7b9a5a876dc191ade3517fded2205c50
parent918df636d8e063bbb8afc0ea681a8bfe9ded87a3
Merge branch 'develop' into release

Conflicts:
package/changelog
package/pkginfo.manifest
VERSION