commit de85b9f540082711229c49ba82e8e5de6a540d33 Merge: bf6571e af64528 Author: Garrett Holmstrom <gholms at fedoraproject.org> Date: Thu Jul 29 21:38:38 2010 -0500 Merge branch 'f12' into f13 ---