Merge, I committed first

src/modules/sound/lullaby/ModPlugDecoder.cpp

@@ -93,8 +93,11 @@ namespace lullaby
 
 	bool ModPlugDecoder::rewind()
 	{
-		ModPlug_Seek(plug, 0);
-		return true;
+		// Let's reload.
+		ModPlug_Unload(plug);
+		plug = ModPlug_Load(data->getData(), data->getSize());
+		eof = false;
+		return (plug != 0);
 	}
 
 	bool ModPlugDecoder::isSeekable()

src/modules/sound/lullaby/VorbisDecoder.h

@@ -51,7 +51,6 @@ namespace lullaby
 		OggVorbis_File handle;			// Handle to the file
 		vorbis_info * vorbisInfo;		// Info
         vorbis_comment * vorbisComment;	// Comments
-		bool eof;						// Whether we have reached the end of the file
 
 	public: