Christopher Ferris 216bff9ff3 resolve merge conflicts of d676080a37 to lmp-mr1-ub-dev.
am: afff4442ae

* commit 'afff4442ae092469f298a71862d61c65ceb67b03':
  Sync with upstream NetBSD lib/libc/regex.
2015-10-22 22:27:54 +00:00
..
2015-06-04 14:51:26 -07:00
2015-06-04 14:51:26 -07:00
2015-08-25 20:03:11 +01:00
2015-05-08 09:36:03 -07:00