FIX: After-Merge fix
FIX: After-Merge fix

--HG--
branch : sample-framework-devel

cbeck88/cegui-mirror-two,cbeck88/cegui-mirror-two,cbeck88/cegui-mirror-two,cbeck88/cegui-mirror-two,cbeck88/cegui-mirror-two