fixed format for python 2.6
Merge remote-tracking branch 'salt/master'