Merge branch 'master' of 165.213.180.234:/git/slp/pkgs/edje
authorJihoon Kim <jihoon48.kim@samsung.com>
Fri, 17 Sep 2010 11:24:42 +0000 (20:24 +0900)
committerJihoon Kim <jihoon48.kim@samsung.com>
Fri, 17 Sep 2010 11:24:42 +0000 (20:24 +0900)
commit9d006d106b5f0bc152e748053f9c4bfe94a64ca4
treed1354a72891c46a7a9882f3645ef1634568606c8
parent31ac2e22bea9fb8db9e33fa866894af1f405ebb4
parentb29fb35f40be6fbff11c4359005ca8a9bc3376a6
Merge branch 'master' of 165.213.180.234:/git/slp/pkgs/edje