Merged.

Author Pascal J. Bourguignon <pjb@informatimago.com>
Author date 2013-06-24 20:06:18
Author local date 2013-06-24 22:06:18 +0200
Committer Pascal J. Bourguignon <pjb@informatimago.com>
Committer date 2013-06-24 20:06:18
Committer local date 2013-06-24 22:06:18 +0200
Commit 10c44088e44962428bceeae215d36d3a66220ab5
Tree e40e3cefde9fb47394e8c393872e4570081fd9bf
Parent 9473527158bd558691c10eb95d9d55f92f36d30b
Parent b5be0ade4ffad8fdda70ce557530d76655b46512
Merged.
ViewGit