commit 85f23a08ddf4acc7d3164596eba30f404643d6c3 Merge: cef8ddb d60c436 Author: Roland McGrath <roland at redhat.com> Date: Thu Sep 30 16:45:51 2010 -0700 Merge branch 'f14/master' ---