SVN-Revision: 24648
Signed-off-by: Dave Lichterman <laviddichterman@gmail.com> [nand-disk trigger has been removed - juhosg] SVN-Revision: 24642