Merge from gingerbread
tree: ee174bab88e4cfc5b5e81772690e39db24f5aa0e
  1. default.xml