commit bdfffd1fa81b4aaa33f4c998bb5718517718c53f Merge: 181c5a7 9b52e09 Author: Martin Stransky <stransky at anakreon.cz> Date: Fri Jun 24 11:35:19 2011 +0200 Merge remote-tracking branch 'origin/f15' ---