Merge.

diff --cc src/dcp.cc
Simple merge

diff --cc src/subtitle_asset.h
index cc27f958edee5b28303973c0caf65858282c9be5,51385b220e3aefc9273dbd707e812ec5af941bec..44ac455f5fff44e483174e820b10d7482d1e86cd
--- 1/src/subtitle_asset.h
--- 2/src/subtitle_asset.h
+++ b/src/subtitle_asset.h
@@@ -90,15 -89,26 +89,26 @@@ protected
        /** All our subtitles, in no particular order */
        std::list<SubtitleString> _subtitles;
  
-       class FileData : public Data {
+       class Font
+       {
        public:
-               FileData () {}
+               Font (std::string load_id_, std::string uuid_, boost::filesystem::path file_)
+                       : load_id (load_id_)
+                       , uuid (uuid_)
+                       , data (file_)
+                       , file (file_)
+               {}
  
-               FileData (boost::shared_array<uint8_t> data_, boost::uintmax_t size_)
-                       : Data (data_, size_)
+               Font (std::string load_id_, std::string uuid_, Data data_)
+                       : load_id (load_id_)
+                       , uuid (uuid_)
+                       , data (data_)
                {}
 -              
 +
-               /** .ttf file that this data was last written to */
+               std::string load_id;
+               std::string uuid;
+               Data data;
+               /** .ttf file that this data was last written to, if applicable */
                mutable boost::optional<boost::filesystem::path> file;
        };