Merge branch 'option-validation-196' into next
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Tue, 10 May 2011 05:02:43 +0000 (07:02 +0200)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Tue, 10 May 2011 05:02:43 +0000 (07:02 +0200)
This fixes #196.


Trivial merge