merged from trunk
commitc05c21ed109720d66c834a0c5b21ea29416683a6
authorJoakim Verona <joakim@verona.se>
Mon, 14 Jun 2010 09:48:51 +0000 (14 11:48 +0200)
committerJoakim Verona <joakim@verona.se>
Mon, 14 Jun 2010 09:48:51 +0000 (14 11:48 +0200)
tree8d19421c6601094a1326bbd167d09e349742ef02
parent69fd80388b70ccb8ea04dd3ff046c56672243ffa
parentd8b0cdddb3c1e4555a50423a9b69234f55fc8f9b
merged from trunk
configure
configure.in
lisp/image.el
src/Makefile.in
src/config.in
src/image.c