Add .o to .gitignore.
Merge branch 'aquamacs24' of git://github.com/davidswelt/aquamacs-emacs into aquamacs24
Merge branch 'aquamacs24' of git://github.com/davidswelt/aquamacs-emacs into aquamacs24
Merge branch 'aquamacs24' of git://github.com/davidswelt/aquamacs-emacs into aquamacs24
Merge branch 'aquamacs24' of git://github.com/davidswelt/aquamacs-emacs into aquamacs24
Merge branch 'aquamacs24' of git://github.com/davidswelt/aquamacs-emacs into aquamacs24
Merge branch 'aquamacs24' of git://github.com/davidswelt/aquamacs-emacs into aquamacs24
Merge branch 'aquamacs24' of git://github.com/davidswelt/aquamacs-emacs into aquamacs24

Merge needed because of difference in .gitignore (!).

it merges an updated upstream into a topic branch.
Merge branch 'aquamacs24' of git://github.com/davidswelt/aquamacs-emacs into aquamacs24

Still .gitignore means we need to merge.
Merge branch 'aquamacs24' of github.com:rpgoldman/aquamacs-emacs into aquamacs24

Merging in some additions to .gitignore.