Merge into develop

diff --cc kamaki/clients/tests.py
index f2e3f20,45f5d64..b240b13
--- 1/kamaki/clients/tests.py
--- 2/kamaki/clients/tests.py
+++ b/kamaki/clients/tests.py
@@@ -2293,9 -2283,12 +2293,9 @@@ class testPithos(unittest.TestCase)
          f = open(self.fname, 'w')
          sys.stdout.write(
              ' create random file %s of size %s      ' % (name, size))
-         for hobyte_id in range(size / 8):
+         for hobyte_id in xrange(size / 8):
 -            #sss = 'hobt%s' % random.randint(1000, 9999)
 -            f.write(rf.read(8))
 +            random_bytes = os.urandom(8)
 +            f.write(random_bytes)
              if 0 == (hobyte_id * 800) % size:
                  f.write('\n')
                  f.flush()