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)
commit0a3187e2edacdda70c9a63bc028eef3b495bb3a7
tree324ef40f683cea715a82141f3f2ca7c0fc60f59e
parent83875e660c13f5bc790543ee20d25186c8713380
parent0c322222e2011f8eed24e3d7631fc456afbc43f4
Merge branch 'upstream'

Conflicts:
src/cache.c
src/cache.h