commit b497246cfdebf1c460a8bfa4cde5683efa54d2de Merge: 4228c3d c10abc7 Author: Martin Stransky <stransky at anakreon.cz> Date: Wed Jan 9 12:55:33 2013 +0100 Merge branch 'f17' ---