Merge branch 'master' into tests
authorDuke Leto <jonathan@leto.net>
Fri, 9 Oct 2009 04:18:46 +0000 (21:18 -0700)
committerDuke Leto <jonathan@leto.net>
Fri, 9 Oct 2009 04:18:46 +0000 (21:18 -0700)
commit38211a5f2ce50be209e8108e19366b2ca407ac24
tree4159263f0f3f464a89a7944cc92e7f9977ff1e8a
parent6e918977e7cee61a15c23a23171df0a4f970c9a6
parentf638d31b9d3bab9192c263de606313115e674617
Merge branch 'master' into tests

Conflicts:
src/Makefile.in
src/Makefile.in