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)
1  2 
etc/NEWS
lisp/image.el

diff --cc etc/NEWS
Simple merge
diff --cc lisp/image.el
Simple merge