Merge branch 'release-0.20' into develop
authormunkyu.im <munkyu.im@samsung.com>
Tue, 21 Feb 2012 13:30:28 +0000 (22:30 +0900)
committermunkyu.im <munkyu.im@samsung.com>
Tue, 21 Feb 2012 13:30:28 +0000 (22:30 +0900)
commit163e8c360cadbb1db4a427dd45bf8df32480aa30
tree435a5ac25246b254fda0165c76eac1393d1bf753
parentb59e9110285d1fa8eb27ec0cf0429d4628f1b2c0
parent66564f122cb88db54f52e5d07db7b05bfbc81fc2
Merge branch 'release-0.20' into develop

Conflicts:
package/pkginfo.manifest
tizen/src/fileio.c
tizen/src/vtm.c
tizen/src/fileio.c