Set up merge point from gingerbread
tree: 180814e53be84b8fabe63cc3af512328453cb738
  1. default.xml