Merge remote-tracking branch 'XTUPLE/4_6_x' into 23607
authorLinda Nichols <lynnaloo@gmail.com>
Fri, 23 May 2014 17:32:03 +0000 (17:32 +0000)
committerLinda Nichols <lynnaloo@gmail.com>
Fri, 23 May 2014 17:32:03 +0000 (17:32 +0000)

Trivial merge