Merge branch 'develop' into internal_release
authorjihye kim <jihye1128.kim@samsung.com>
Wed, 13 Jun 2012 06:00:27 +0000 (15:00 +0900)
committerjihye kim <jihye1128.kim@samsung.com>
Wed, 13 Jun 2012 06:00:27 +0000 (15:00 +0900)
commit495fb81deaaef6ecfd351961a38c58a1a9b3d663
treed1de829e21dc0836b9ac581f9cbe94ac64907c51
parentc31937a0fcdb826d1238419945c79b921c165f0b
parentb5c884cf2111d5a0340852017ed5e7b0f3255cb8
Merge branch 'develop' into internal_release

Conflicts:
VERSION
VERSION