merge from trunk, no conflicts
authorJoakim Verona <joakim@verona.se>
Wed, 18 Aug 2010 11:11:01 +0000 (13:11 +0200)
committerJoakim Verona <joakim@verona.se>
Wed, 18 Aug 2010 11:11:01 +0000 (13:11 +0200)
commit432c97542003050bab643a8f901feaa326f8369f
tree8173d1c28d8a4c6fcaa7e49a55eea81abb248a97
parent16a911401bdd45cbe05b42db9880bf2941308a78
parent9acd1bdcb92f77cb7d5312d69d47ff2942751132
merge from trunk, no conflicts
etc/NEWS
lisp/image.el