commit 8142d41cd68a1634d514f396d9a8e23904f24b60 Merge: a017e84 f290f6b Author: Roland McGrath <roland at redhat.com> Date: Thu Jul 29 16:20:21 2010 -0700 Merge remote branch 'origin/f12/master' ---