Merge remote-tracking branch 'XTUPLE/4_5_x' into 23853
authorLinda Nichols <lynnaloo@gmail.com>
Sun, 22 Jun 2014 16:44:23 +0000 (16:44 +0000)
committerLinda Nichols <lynnaloo@gmail.com>
Sun, 22 Jun 2014 16:44:23 +0000 (16:44 +0000)

Trivial merge