FreeNAS Code

Merge changes from ix to sf-trunk

Also, fix the column width in the email hint so it looks less braindead.

------------------------------------------------------------------------
r4129 | delphij | 2011-11-18 10:54:52 -0800 (Fri, 18 Nov 2011) | 4 lines

When starting or stopping NFS service, start statd and lockd as well.
Otherwise the user have to reboot or manually make lockd and statd
running.

Don't try to add 1 minute when minute == 59. In reality this should never
happen but better safe than sorry.

StrictHostKeyChecking and BatchMode for rsync over ssh,
this should do it to make rsync over ssh works with RSA/DSA keys
Next step should be make it work with ssh+plain password+expect ?

for some reason this changed for dojo 1.7

add append_url to NavType

ix-crontrab modified to work with rsync over ssh

first step to get rsync over ssh working (mostly GUI part)

Add template block to generic model add/edit

order services tab

Include an option for SSH port number in Replication config