Merge commit 'schmonz/master' into cvs
authorJoey Hess <joey@gnu.kitenet.net>
Wed, 2 Sep 2009 19:36:16 +0000 (15:36 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Wed, 2 Sep 2009 19:36:16 +0000 (15:36 -0400)
commitbb2697ca5e39bc40a18aa01582087cc5c558442e
treeddddbddf8aa8b0c226aaf6c04f7c00ced72b2aff
parent4026650c8751f29890692f10833dae2b200cfc78
parent85844b8494dd5e032d06afd623c25b4bb4a72578
Merge commit 'schmonz/master' into cvs