Merge "Fix build with Gcc 4.7." into tizen_2.1