Merge from trunk
commit1c06cfa6c20d8bfd14aca98d557e9ae19963d881
authorMartin Rudalics <rudalics@gmx.at>
Thu, 1 Jul 2010 09:05:53 +0000 (1 11:05 +0200)
committerMartin Rudalics <rudalics@gmx.at>
Thu, 1 Jul 2010 09:05:53 +0000 (1 11:05 +0200)
tree37c9d49ad961dcecd8b3241de34f072561b6b421
parent973f13965baef6e436c1ae48e725041e440d973f
parentb32d1614abd91e784a95a34b9979b7ec0c541c9e
Merge from trunk
lisp/ChangeLog
src/ChangeLog
src/frame.c