Merge branch 'refs/heads/vect-avoid-merge'
authorManuel M T Chakravarty <chak@cse.unsw.edu.au>
Wed, 6 Feb 2013 02:13:59 +0000 (13:13 +1100)
committerManuel M T Chakravarty <chak@cse.unsw.edu.au>
Wed, 6 Feb 2013 02:13:59 +0000 (13:13 +1100)

Trivial merge