merged

diff --combined Changes
index 0a45e20,798103e..0ea7aec
--- 1/Changes
--- 2/Changes
+++ b/Changes
@@@ -1,11 -1,8 +1,13 @@@
  Revision history for MooseX-Types-Structured
  
 -{{NEXT}}
 +0.25   28 December 2010
 +        - fixed bug where ->is_subtype_of dies meaninglessly when the type we
 +          are trying to check is not a type we can find.  This makes our
 +          handling consistent with core Moose.  Also changed ->equals and
 +          ->is_a_type_of to be consistent.
 +        - Added test case for above
+         - The test suite now uses Test::Fatal instead of Test::Exception (Karen
+           Etheridge).
  
  0.24   16 November 2010
          - Added some performance enhancing caching code (phaeton)

diff --combined dist.ini
index 882e33c,cffd919..20d6f63
--- 1/dist.ini
--- 2/dist.ini
+++ b/dist.ini
@@@ -1,5 -1,5 +1,5 @@@
  name    = MooseX-Types-Structured
 -version = 0.24
 +version = 0.25
  author  = John Napiorkowski <jjnapiork@cpan.org>
  author  = Florian Ragwitz <rafl@debian.org>
  author  = Yuval Kogman <nothingmuch@woobling.org>
@@@ -21,5 -21,5 +21,5 @@@ Sub::Exporter = 0.98
  
  [Prereqs / BuildRequires]
  Test::More = 0.94
- Test::Exception = 0.27
+ Test::Fatal = 0.003