Merge mainline changes
commitea15a89ad4ebd576ab3620748f7af9e29f5809c0
authorVojtech Horky <vojtechhorky@users.sourceforge.net>
Mon, 29 Apr 2013 14:26:22 +0000 (29 16:26 +0200)
committerVojtech Horky <vojtechhorky@users.sourceforge.net>
Mon, 29 Apr 2013 14:26:22 +0000 (29 16:26 +0200)
tree00e9c82f9389d4fdeb2a1aa997a5145b6225f9bf
parentb2fa2d86f31fd2f3a0ce7dad1f5039f5efa891f1
parent9e7898e4e94c2715de7d87c6aa29d0768cdbaf2e
Merge mainline changes