commit 06a94c4cd9ed03cd39b37abe5aef3d2e64f04f5f Merge: 83cc664 c10b413 Author: Michal Ambroz <rebus at seznam.cz> Date: Sun Mar 27 14:11:46 2011 +0200 Merge remote-tracking branch 'origin/el4/master' ---