Commit 8febf57af0a89dd33b8dd8d026b84b92eafc9987

Con Kolivas 2011-08-16T09:45:16

Keep options in alphabetical order.