Updated the CVS tags from the "khorben-n900" branch