[master] 20130725 1541

Signed-off-by: lucas <lucas.heewook.park@gmail.com>