Merge with master. Conflicts:
authorLinus Nordberg <linus@nordu.net>
Wed, 28 Sep 2011 11:10:12 +0000 (13:10 +0200)
committerLinus Nordberg <linus@nordu.net>
Wed, 28 Sep 2011 11:10:12 +0000 (13:10 +0200)
commitdfadeec9cd47ce9f71f4bba7bc80efda4f8fd94a
tree08df7446fc89cfe9572c0bbe8778b47443e403a9
parent52a34859e9d39a12bf5942ae2cee6fe55881f3a4
parent5e057b3271a05ba7e83fc6c0b43db8c6b9926123
Merge with master.  Conflicts:
  ChangeLog
  README
  config.guess
  config.sub
  configure
  configure.ac
ChangeLog
README
configure
configure.ac