Merge branch 'next'
authorStefano Zacchiroli <zack@upsilon.cc>
Mon, 12 Mar 2012 17:08:14 +0000 (18:08 +0100)
committerStefano Zacchiroli <zack@upsilon.cc>
Mon, 12 Mar 2012 17:08:14 +0000 (18:08 +0100)

Trivial merge