Merge remote-tracking branch 'XTUPLE/4_4_x'
authorDave Anderson <anderson@ANDLINUX101.(none)>
Sun, 11 May 2014 20:10:25 +0000 (08:10 +1200)
committerDave Anderson <anderson@ANDLINUX101.(none)>
Sun, 11 May 2014 20:10:25 +0000 (08:10 +1200)

Trivial merge