vchoi_fork

[svn-r27885] Description:
    Check if the layout has been retrieved before setting it again.

Tested on:
    MacOSX/64 10.10.5 (amazon) w/serial & parallel
    (h5committest not required on this branch)