Merge commit 'smcv/ready/trivia'
authorJoey Hess <joey@gnu.kitenet.net>
Fri, 28 Aug 2009 18:45:38 +0000 (14:45 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Fri, 28 Aug 2009 18:45:38 +0000 (14:45 -0400)
commit1513404600bcff6bfc003d78b844ab097a2e3355
tree7d6efef461c2d8f2eb01361db79017ea88961811
parentb6e589c9a484a60b804b9208b41209ca05101682
parent8b927d4a6565125bc09d18d9e971f804d1e44e0a
Merge commit 'smcv/ready/trivia'