Merge branch 'switch_default'
authorJean Privat <jean@pryen.org>
Fri, 19 Jul 2013 16:15:08 +0000 (12:15 -0400)
committerJean Privat <jean@pryen.org>
Fri, 19 Jul 2013 16:15:08 +0000 (12:15 -0400)

Trivial merge