Merge branch 'dev' into gst

Conflicts:
	tests/testdecoding.py

diff --cc tests/testdecoding.py
index 020519777ae7f240af84d44e3cfe5d7c30b4f39c,99e3e11aaf550caa74a46f9e8d29bec8f98d17cf..a038f1f6ae07c547381b0cdbd6fba1d48fa4a4d3
--- 1/tests/testdecoding.py
--- 2/tests/testdecoding.py
+++ b/tests/testdecoding.py
@@@ -7,8 -9,8 +7,8 @@@ class TestDecoding(TestCase)
      "Test the low level streaming features"
  
      def setUp(self):
 -        pass
 +        self.samplerate, self.channels, self.blocksize = None, None, None
-    
+ 
      def testWav(self):
          "Test wav decoding"
          self.source = os.path.join (os.path.dirname(__file__),  "samples/sweep.wav")