pfSense

Merge remote branch 'mainline/master'

Conflicts:
usr/local/www/services_rfc2136.php
usr/local/www/services_snmp.php
usr/local/www/status_rrd_graph.php
usr/local/www/status_rrd_graph_settings.php

Correct my email address, adjust copyright to 2010

Corrections gettext implementation on status_upnp.php

Implement gettext() calls on status_upnp.php

Add NAT-PMP support to UPnP. Fixes #262. Thanks to Salvatore LaMendola for the patch.

Add pfSense_BUILDER_BINARIES: and pfSense_MODULE:. Adjust Copyright to include 2009 on files that I have asserted (C) on

Add sorting ability to status -> UPNP

Rewrite the pfsense privilege system with the following goals in mind ...

1) Redefine page privileges to not use static urls
2) Accurate generation of privilege definitions from source
3) Merging the user and group privileges into a single set
4) Allow any privilege to be added to users or groups w/ inheritance...

Update pattern for rtable support

Add product_copyright re-branding support
Add product_copyright_years re-branding support
Add product_website re-branding support
Add product_email re-branding support

Work sponsored-by: Centipede Networks

Switch over to array style page titles. Obtained-from: m0n0wall

-move upnp_action to services.inc
-make sure to clear rules when stopping miniupnpd
-fix status_upnp and status_services pages so they use upnp_action and not the rcfile

-fix div tag placement causing formatting issue when upnp disabled

-bump miniupnpd version 20070521
-dropped status tab from upnp services page
-dropped tabs from upnp status page

MFC miniupnpd changes from Ryan Wagoner

MFC UPNP support6