2 files changed, 9 insertions, 2 deletions

diff --git a/src/unstable/uuid.cpp b/src/unstable/uuid.cpp
index 06e8c01..a93f713 100644
--- a/src/unstable/uuid.cpp
+++ b/src/unstable/uuid.cpp
@@ -160,15 +160,20 @@ template<> bool Bu::__cmpHashKeys<Bu::Uuid>( const Bu::Uuid &a, const Bu::Uuid &
     return a == b;
 }
 
-Bu::ArchiveBase &Bu::operator>>( Bu::ArchiveBase &ar, Uuid &u )
+Bu::ArchiveBase &Bu::operator>>( Bu::ArchiveBase &ar, Bu::Uuid &u )
 {
     ar.read( u.data, 16 );
     return ar;
 }
 
-Bu::ArchiveBase &Bu::operator<<( Bu::ArchiveBase &ar, const Uuid &u )
+Bu::ArchiveBase &Bu::operator<<( Bu::ArchiveBase &ar, const Bu::Uuid &u )
 {
     ar.write( u.data, 16 );
     return ar;
 }
 
+Bu::Formatter &Bu::operator<<( Bu::Formatter &f, const Bu::Uuid &u )
+{
+    return f << u.toString();
+}
+
diff --git a/src/unstable/uuid.h b/src/unstable/uuid.h
index e7c5f00..35cb69c 100644
--- a/src/unstable/uuid.h
+++ b/src/unstable/uuid.h
@@ -64,8 +64,10 @@ namespace Bu
     template<> bool __cmpHashKeys<Uuid>(
         const Uuid &a, const Uuid &b );
 
+    class Formatter;
     Bu::ArchiveBase &operator>>( Bu::ArchiveBase &ar, Uuid &u );
     Bu::ArchiveBase &operator<<( Bu::ArchiveBase &ar, const Uuid &u );
+    Bu::Formatter &operator<<( Bu::Formatter &f, const Uuid &u );
 };
 
 #endif