Merge branch 'devel' into rforge-local (version 0.21.3)

git-svn-id: svn://svn.r-forge.r-project.org/svnroot/nmf@192 edb9625f-4e0d-4859-8d74-9fd3b1da38cb
Merge branch 'master' 0.22 into rforge-local

git-svn-id: svn://svn.r-forge.r-project.org/svnroot/nmf@193 edb9625f-4e0d-4859-8d74-9fd3b1da38cb