Merge branch '2.4' into blur_border_isolated
authorSeunghoon Park <pclove1@gmail.com>
Tue, 28 Jan 2014 01:44:03 +0000 (20:44 -0500)
committerSeunghoon Park <pclove1@gmail.com>
Tue, 28 Jan 2014 01:44:03 +0000 (20:44 -0500)

Trivial merge