KLIPS: remove NAT_TRAVERSAL check (not to be confused with CONFIG_NAT*)
packaging: Fix srcdir in openrc Makfile

Signed-off-by: Paul Wouters <pwouters@redhat.com>
Merge branch 'master' into github_master