Merge from GNU trunk: defcustom :types.

------------------------------------------------------------
revno: 112526
committer: Glenn Morris <rgm@gnu.org>
branch nick: trunk
timestamp: Wed 2013-05-08 21:40:20 -0400
message:
  Fix a bunch of custom types (thank you cus-test.el)
Checkdoc fixes. No functional change.