Merge mainline changes
commitb800b0e69c5b9444cbb4dc50577bd4611a814fb7
authorVojtech Horky <vojtechhorky@users.sourceforge.net>
Tue, 23 Oct 2012 13:16:49 +0000 (23 15:16 +0200)
committerVojtech Horky <vojtechhorky@users.sourceforge.net>
Tue, 23 Oct 2012 13:16:49 +0000 (23 15:16 +0200)
treeccd0b91067e1044b09e6536938049f08bd96e834
parent32b3a12dc482e086388221ed04d85afa521e0308
parentb2ac3998f80b325688c672166d5691a55d8f7811
Merge mainline changes