Merge branch 'poset_metrics'
authorJean Privat <jean@pryen.org>
Tue, 23 Jul 2013 16:51:19 +0000 (12:51 -0400)
committerJean Privat <jean@pryen.org>
Tue, 23 Jul 2013 16:51:19 +0000 (12:51 -0400)

Trivial merge