The recent trunk merge of reorganized USRP code may result in
difficulty doing an svn update to an existing working copy. If you
encounter an issue, you may either check out a new copy of the trunk,
or delete the contents of your working directory (except for the top
.svn subdirectory) and then reperform the svn update.