commit 0c4be301530f339bb7ff5a9985a3a67539836f65 Merge: f5eef3f 6cba20c Author: Nathanael D. Noblet <nathanael at gnat.ca> Date: Sun Sep 11 21:01:35 2011 -0600 Merge remote-tracking branch 'origin/f15' into el6 ---