Pull up following revision(s) (requested by apb in ticket #949):
	share/zoneinfo/australasia: revision 1.33
Merge the Fiji-related change from tzdata2013e.
This is the only urgent change in tzdata2013e.
     This year Fiji will start DST on October 27, not October 20.
     (Thanks to David Wheeler for the heads-up.)  For now, guess that
     Fiji will continue to spring forward the Sunday before the fourth
     Monday in October.
Ticket 949
Pull up following revision(s) (requested by khorben in ticket #951):
	usr.bin/flock/flock.1: revision 1.9
flock(1) really appeared first in NetBSD 6.1
Ticket 951.
Whitespace fixes.
Pull up following revision(s) (requested by rmind in ticket #952):
	sys/net/npf/npf_ctl.c: revision 1.27
npfctl_rule: fixes for the dynamic rules.
Ticket 952.
Pull up following revision(s) (requested by tsutsui in ticket #953):
	sys/arch/mvme68k/mvme68k/pmap_bootstrap.c: revision 1.52
Move physmem calculations before nptpage initialization.
Fixes mvme68k specific part of PR port-m68k/45915
(panic: pmap_enter_ptpage: can't get KPT page).
Reported and confirmed by Andrew Gillham on his MVME177:
http://mail-index.NetBSD.org/port-mvme68k/2013/09/17/msg000082.html
Should be pulled up to all netbsd-6 branches.
Ticket 953