commit 37f7f630a591ae884e438f9575353c3f088bba2f Merge: ef17589 5648b98 Author: Michal Ambroz <rebus at seznam.cz> Date: Sun Mar 27 01:28:13 2011 +0100 Merge remote-tracking branch 'origin/master' into f12/master ---