commit 6ea6104d14adbc9adec35a648e79b43ea83a2540 Merge: 63eb271 37f7f63 Author: Michal Ambroz <rebus at seznam.cz> Date: Sun Mar 27 14:15:30 2011 +0200 Merge remote-tracking branch 'origin/f12/master' ---