org.NetBSD.atf.src: 0e0b01a992bc811f95008c2ec4b97cc8fc627c67

[jmmv%NetBSD.org@localhost]

revision:            0e0b01a992bc811f95008c2ec4b97cc8fc627c67
date:                2010-06-10T16:03:42
author:              jmmv%NetBSD.org@localhost
branch:              org.NetBSD.atf.src
changelog:
Fix broken merge

Aghh, vimdiff, why are you so confusing...

manifest:
format_version "1"

new_manifest [669b7c616d1dc5591617e51fc1487401a23df7bf]

old_revision [1558bc2b215cb0280cf63f7341b6751a7a1ccbad]

patch "atf-run/test-program.cpp"
 from [aac92cbe52d2b880530d4f2e26e9782be7edad8e]
   to [7e2ca6efd2ccaa3b7073ff798822f3e7369cc1a6]

patch "atf-run/test-program.hpp"
 from [98a8b0df9e1c198458a9eb30c11531acefe8543f]
   to [773a8cb052fe6cef782dfcb1023bab6fcd202f9c]

patch "tests/atf/atf-run/t_integration.sh"
 from [ee948baf6c807922a71a20121a5c0c8c9157c5c5]
   to [324c03b559eab0ee0153a4f6b3594de30b069213]