Merge branch 'bug557383-vfuncs'
authorColin Walters <walters@verbum.org>
Thu, 26 Feb 2009 19:44:24 +0000 (14:44 -0500)
committerColin Walters <walters@verbum.org>
Thu, 26 Feb 2009 19:44:24 +0000 (14:44 -0500)

Trivial merge