Commit: 7999520ec5d27fd62d53b677e8a0bcc2a86bd61f

Author: gwoo | Date: 2010-01-25 09:43:37 -0800
Merge branch '0.5' into u1m-0.5