merge from trunk
commita8101f663e6cbff953b67b8bef33bc0171818477
authorJoakim Verona <joakim@verona.se>
Tue, 17 Aug 2010 21:19:11 +0000 (17 23:19 +0200)
committerJoakim Verona <joakim@verona.se>
Tue, 17 Aug 2010 21:19:11 +0000 (17 23:19 +0200)
tree8f71a16188f75e91670e05379fb4de2d0136cbf4
parentfe72c5b4651334677326104ec138e7cdd50f2ffe
parent489cd5bd5a0128d6c3bee49fa2c451f2927ddea9
merge from trunk
configure
configure.in
lisp/image-mode.el
src/Makefile.in
src/config.in
src/image.c