Comment do you want copyleft or not? (Score 2, Interesting) 8
The GFDL and CC-BY are rather different licenses. The first is a copyleft license (requires adaptations to be distributed under the same license), the latter is a permissive license (do anything you want so long as you give credit, roughly).
If you don't want copyleft, CC-BY is your choice.
If you do want copyleft, it would make sense to choose between GFDL and CC-BY-SA, which you can think of as the copyleft version of CC-BY. Wikipedia (and other Wikimedia sites) migrated from the GFDL to CC-BY-SA as their primary content license in June, see http://creativecommons.org/weblog/entry/15411
Thanks for not considering a more restrictive license.