MERGE merging with trunk

git-svn-id: http://crux-framework.googlecode.com/svn@5013 a5d2bbaa-053c-11de-b17c-0f1ef23b492c
git-svn-id: http://crux-framework.googlecode.com/svn@5014 a5d2bbaa-053c-11de-b17c-0f1ef23b492c
git-svn-id: http://crux-framework.googlecode.com/svn@5015 a5d2bbaa-053c-11de-b17c-0f1ef23b492c