Merge branch 'template' into develop
authorBon-Yong Lee <bonyong.lee@samsung.com>
Thu, 18 Oct 2012 01:14:24 +0000 (10:14 +0900)
committerBon-Yong Lee <bonyong.lee@samsung.com>
Thu, 18 Oct 2012 01:14:24 +0000 (10:14 +0900)
commit533a4d0a47cbdc84115c324ffeb7b3326222ba42
treefd36caf4bdd7f80deb2cf2aa8d36ce2fcee1a7ff
parent37ade025add1d79266ddf36a545ad73ea9ed6048
parent2f302129965041a96d0490d667af72b1f2c6ed5a
Merge branch 'template' into develop