Merge remote branch 'remotes/elrond/refactor/gmg_cf_option'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Sun, 23 Oct 2011 20:22:18 +0000 (15:22 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Sun, 23 Oct 2011 20:22:18 +0000 (15:22 -0500)

Trivial merge