Merge branch 'develop' into release
authorjihye kim <jihye1128.kim@samsung.com>
Fri, 7 Sep 2012 06:12:40 +0000 (15:12 +0900)
committerjihye kim <jihye1128.kim@samsung.com>
Fri, 7 Sep 2012 06:12:40 +0000 (15:12 +0900)
commitc588265c00430fa39540bd01940045ed2bbc958f
tree0ffe5405ad639b29bba5ae8b72600f5654e3fecb
parent7a8611b3ed7bc40b87ac6cbc93575d92d8587f2f
parent46fccac97d893844c890f29b50dbaf3392030b81
Merge branch 'develop' into release

Conflicts:
package/pkginfo.manifest