Merged.

Author Pascal J. Bourguignon <pjb@informatimago.com>
Author date 2013-06-22 10:25:10
Author local date 2013-06-22 12:25:10 +0200
Committer Pascal J. Bourguignon <pjb@informatimago.com>
Committer date 2013-06-22 10:25:10
Committer local date 2013-06-22 12:25:10 +0200
Commit f259b5c3b0afe574963a70d6616c9715e193d792
Tree 368c1475f2fc3a8053d7e09ded714b90e315a7aa
Parent 377ded224a154c91ef9e5188e59abcc88a675531
Parent 2053c40caad84d97c0150789886a681bf0e60721
Merged.
ViewGit