merge
authorJoey Hess <joey@gnu.kitenet.net>
Sat, 12 Dec 2009 20:50:32 +0000 (15:50 -0500)
committerJoey Hess <joey@gnu.kitenet.net>
Sat, 12 Dec 2009 20:50:32 +0000 (15:50 -0500)
commit0fe8cfd3e1dad0816947fdf88cc0dba778aea067
treeb1808684e9c8f5ce35ed98a7e7a31d5c50eba4db
parent4b276377915198112856929c37d16697cbb7aaf3
parentc1ec0037ebf5dfc62bd1d132201c608f3875253d
merge