Merge branch 'master' of http://git.code.sf.net/p/nuttx/git into cryptoapi
Merge branch 'master' into cryptoapi