merging NAMESPACE with AnnotatedDataFrame import

git-svn-id: https://hedgehog.fhcrc.org/bioconductor/branches/RELEASE_2_13/madman/Rpacks/crlmm@86688 bc3139a8-67e5-0310-9ffc-ced21a209358
Merge branch 'local-hedgehog'