Merge commit 'origin/master'
authorJoey Hess <joey@gnu.kitenet.net>
Tue, 29 Sep 2009 17:35:41 +0000 (13:35 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Tue, 29 Sep 2009 17:35:41 +0000 (13:35 -0400)
commit4d9976060be0a0f84120d9edfc8966dc986f2b55
treedd6a6b30be799fef331624c03399ff3d2685de73
parentac8ecdcf68b89544d126032718e225add0a09238
parent9bea3db4f37a934846cf8d3ac9f57a615bdad422
Merge commit 'origin/master'