Merge branch 'for-3.4'
authorSteve French <sfrench@us.ibm.com>
Tue, 27 Mar 2012 02:14:05 +0000 (21:14 -0500)
committerSteve French <sfrench@us.ibm.com>
Tue, 27 Mar 2012 02:14:05 +0000 (21:14 -0500)

Trivial merge