Merge branch 'upstream'
authorJoel Rosdahl <joel@debian.org>
Mon, 11 Jan 2010 20:39:36 +0000 (21:39 +0100)
committerJoel Rosdahl <joel@debian.org>
Mon, 11 Jan 2010 20:39:36 +0000 (21:39 +0100)
Conflicts:
src/cache.c
src/cache.h


Trivial merge