Merge remote-tracking branch 'origin/lexical-literals'
authorAndy Wingo <wingo@pobox.com>
Thu, 30 Jun 2011 11:48:43 +0000 (13:48 +0200)
committerAndy Wingo <wingo@pobox.com>
Thu, 30 Jun 2011 11:48:43 +0000 (13:48 +0200)
commit26c81c7f405c545ffe9d2dab59349d9aba146348
treec83e767664f9168f4b95362040880fc8c97e975d
parent8a562c697bcee569e8004ee1d8a902b3e5acd946
parent04b04af85a331b2cb73d8807b9aa67e2f9c0f34d
Merge remote-tracking branch 'origin/lexical-literals'

Conflicts:
module/ice-9/psyntax-pp.scm
module/ice-9/psyntax-pp.scm
module/ice-9/psyntax.scm
module/oop/goops.scm