tree fb9c08d8cdd12116aa818265ce66db7c6be0830b
parent dd3e84c5b7528aa6a1469282e62330cf4b9189fd
parent 5404174ff797e55c64fb1cb215fcc39b86eb8073
author Young-Seok <kisskys@gmail.com> 1385065745 -0800
committer Young-Seok <kisskys@gmail.com> 1385065745 -0800

merged from master to kisskys/master_fix_issue_510