Merge commit '407ee23a0fd8e0f00f7c41d83ae6fa4007ca229b'
[feedingit] / src / style.py
2010-05-29 YvesAdded THP's patches (5841) and Nelson's patch (#5782)