am 45bd9946: am fec5d38b: Merge "option to enable multisampling" into gingerbread

Merge commit '45bd99466ce9962778eacaefff1c0a44bb268f0c'

* commit '45bd99466ce9962778eacaefff1c0a44bb268f0c':
  option to enable multisampling