From: Peter Rosin <peda@lysator.liu.se>
Date: Fri, 2 Mar 2012 12:04:13 +0000 (+0100)
Subject: Merge branch 'fix-vala-test-for-branch-1.11' into branch-1.11
X-Git-Tag: v1.11.3b~16
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3c0d8213bc1d7a6a11defbd8d1e904fb0a1eee99;p=platform%2Fupstream%2Fautomake.git

Merge branch 'fix-vala-test-for-branch-1.11' into branch-1.11

* fix-vala-test-for-branch-1.11:
  tests: fix (harmless) botched merge
---

3c0d8213bc1d7a6a11defbd8d1e904fb0a1eee99