Merge branch 'topic/conflicting_upstream_deps'
Karen Etheridge [Thu, 13 Jun 2013 21:44:33 +0000 (14:44 -0700)]
We now have conflict tracking! Please keep it up to date when an issue is observed.


Trivial merge