Merge commit 'upstream/20090420' into dfsg_clean

Merge commit 'upstream/20090420' into dfsg_clean

Conflicts:
	configure
	testcases/kernel/syscalls/getitimer/getitimer03.c
	testcases/kernel/syscalls/getresgid/getresgid01.c
	testcases/open_hpi_testsuite/Makefile.in
	testcases/open_hpi_testsuite/README
	testcases/open_hpi_testsuite/clients/Makefile.in
	testcases/open_hpi_testsuite/clients/clients.c
	testcases/open_hpi_testsuite/clients/hpialarms.c
	testcases/open_hpi_testsuite/clients/hpiel.c
	testcases/open_hpi_testsuite/clients/hpievents.c
	testcases/open_hpi_testsuite/clients/hpifan.c
	testcases/open_hpi_testsuite/clients/hpiinv.c
	testcases/open_hpi_testsuite/clients/hpionIBMblade.c
	testcases/open_hpi_testsuite/clients/hpipower.c
	testcases/open_hpi_testsuite/clients/hpireset.c
	testcases/open_hpi_testsuite/clients/hpisensor.c
	testcases/open_hpi_testsuite/clients/hpisettime.c
	testcases/open_hpi_testsuite/clients/hpithres.c
	testcases/open_hpi_testsuite/clients/hpitop.c
	testcases/open_hpi_testsuite/clients/hpitree.c
	testcases/open_hpi_testsuite/clients/hpiwdt.c
	testcases/open_hpi_testsuite/config.h.in
	testcases/open_hpi_testsuite/configure
	testcases/open_hpi_testsuite/configure.ac
	testcases/open_hpi_testsuite/cpp/Makefile.in
	testcases/open_hpi_testsuite/cpp/t/Makefile.in
	testcases/open_hpi_testsuite/docs/Makefile.in
	testcases/open_hpi_testsuite/docs/hld/Makefile.in
	testcases/open_hpi_testsuite/docs/hld/appendix.sgml
	testcases/open_hpi_testsuite/docs/hld/authors.dtd
	testcases/open_hpi_testsuite/docs/hld/bookinfo.sgml
	testcases/open_hpi_testsuite/docs/hld/introduction.sgml
	testcases/open_hpi_testsuite/docs/hld/legal.dtd
	testcases/open_hpi_testsuite/docs/hld/obtaining.sgml
	testcases/open_hpi_testsuite/docs/hld/openhpi-manual.sgml
	testcases/open_hpi_testsuite/docs/hld/openhpi_highlevel.sgml
	testcases/open_hpi_testsuite/docs/hld/openhpi_structure.sgml
	testcases/open_hpi_testsuite/docs/hld/plugin_guide.sgml
	testcases/open_hpi_testsuite/docs/hld/plugin_usage.sgml
	testcases/open_hpi_testsuite/docs/hld/revisions.dtd
	testcases/open_hpi_testsuite/docs/hld/sahpi_breakdown.sgml
	testcases/open_hpi_testsuite/docs/man/Makefile.in
	testcases/open_hpi_testsuite/hpi_shell/Makefile.in
	testcases/open_hpi_testsuite/hpi_shell/cmdparser.c
	testcases/open_hpi_testsuite/hpi_shell/commands.c
	testcases/open_hpi_testsuite/hpi_shell/ctrl_inv.c
	testcases/open_hpi_testsuite/hpi_shell/hpi_cmd.c
	testcases/open_hpi_testsuite/hpi_shell/sensor.c
	testcases/open_hpi_testsuite/hpi_shell/service.c
	testcases/open_hpi_testsuite/hpi_shell/session.c
	testcases/open_hpi_testsuite/include/SaHpi.h
	testcases/open_hpi_testsuite/include/SaHpiAtca.h
	testcases/open_hpi_testsuite/include/oh_handler.h
	testcases/open_hpi_testsuite/ltmain.sh
	testcases/open_hpi_testsuite/marshal/Makefile.in
	testcases/open_hpi_testsuite/marshal/marshal_hpi.c
	testcases/open_hpi_testsuite/marshal/marshal_hpi.h
	testcases/open_hpi_testsuite/marshal/marshal_hpi_types.c
	testcases/open_hpi_testsuite/marshal/marshal_hpi_types.h
	testcases/open_hpi_testsuite/marshal/t/Makefile.in
	testcases/open_hpi_testsuite/openhpi.spec.in
	testcases/open_hpi_testsuite/openhpid/Makefile.am
	testcases/open_hpi_testsuite/openhpid/Makefile.in
	testcases/open_hpi_testsuite/openhpid/oh_client.cpp
	testcases/open_hpi_testsuite/openhpid/oh_client_session.cpp
	testcases/open_hpi_testsuite/openhpid/oh_client_session.h
	testcases/open_hpi_testsuite/openhpid/openhpid.cpp
	testcases/open_hpi_testsuite/plugins/Makefile.in
	testcases/open_hpi_testsuite/plugins/ilo2_ribcl/Makefile.in
	testcases/open_hpi_testsuite/plugins/ilo2_ribcl/ilo2_ribcl.h
	testcases/open_hpi_testsuite/plugins/ilo2_ribcl/ilo2_ribcl_power.c
	testcases/open_hpi_testsuite/plugins/ipmi/Makefile.in
	testcases/open_hpi_testsuite/plugins/ipmi/t/Makefile.in
	testcases/open_hpi_testsuite/plugins/ipmidirect/Makefile.in
	testcases/open_hpi_testsuite/plugins/ipmidirect/ipmi_inventory_parser.cpp
	testcases/open_hpi_testsuite/plugins/ipmidirect/t/Makefile.in
	testcases/open_hpi_testsuite/plugins/oa_soap/Makefile.in
	testcases/open_hpi_testsuite/plugins/oa_soap/oa_soap.c
	testcases/open_hpi_testsuite/plugins/oa_soap/oa_soap.h
	testcases/open_hpi_testsuite/plugins/oa_soap/oa_soap_discover.c
	testcases/open_hpi_testsuite/plugins/oa_soap/oa_soap_event.c
	testcases/open_hpi_testsuite/plugins/oa_soap/oa_soap_event.h
	testcases/open_hpi_testsuite/plugins/oa_soap/oa_soap_oa_event.c
	testcases/open_hpi_testsuite/plugins/oa_soap/oa_soap_power.c
	testcases/open_hpi_testsuite/plugins/oa_soap/oa_soap_power.h
	testcases/open_hpi_testsuite/plugins/oa_soap/oa_soap_re_discover.c
	testcases/open_hpi_testsuite/plugins/oa_soap/oa_soap_re_discover.h
	testcases/open_hpi_testsuite/plugins/oa_soap/oa_soap_sensor.c
	testcases/open_hpi_testsuite/plugins/oa_soap/oa_soap_server_event.c
	testcases/open_hpi_testsuite/plugins/oa_soap/oa_soap_utils.c
	testcases/open_hpi_testsuite/plugins/oa_soap/oa_soap_utils.h
	testcases/open_hpi_testsuite/plugins/rtas/Makefile.in
	testcases/open_hpi_testsuite/plugins/simulator/Makefile.in
	testcases/open_hpi_testsuite/plugins/simulator/t/Makefile.in
	testcases/open_hpi_testsuite/plugins/snmp_bc/Makefile.in
	testcases/open_hpi_testsuite/plugins/snmp_bc/t/Makefile.in
	testcases/open_hpi_testsuite/plugins/sysfs/Makefile.in
	testcases/open_hpi_testsuite/plugins/watchdog/Makefile.in
	testcases/open_hpi_testsuite/scripts/Makefile.in
	testcases/open_hpi_testsuite/scripts/test/Makefile.in
	testcases/open_hpi_testsuite/scripts/test/conformance_report.pl
	testcases/open_hpi_testsuite/scripts/test/coverage_report.pl
	testcases/open_hpi_testsuite/scripts/test/gcov2html.pl
	testcases/open_hpi_testsuite/scripts/test/generate_index.pl
	testcases/open_hpi_testsuite/scripts/test/gsum2html.pl
	testcases/open_hpi_testsuite/scripts/test/testconformance.pl
	testcases/open_hpi_testsuite/scripts/test/testcoverage.pl
	testcases/open_hpi_testsuite/snmp/Makefile.in
	testcases/open_hpi_testsuite/src/Makefile.in
	testcases/open_hpi_testsuite/src/plugin.c
	testcases/open_hpi_testsuite/src/safhpi.c
	testcases/open_hpi_testsuite/src/t/Makefile.in
	testcases/open_hpi_testsuite/src/t/ohpi/Makefile.in
	testcases/open_hpi_testsuite/ssl/Makefile.am
	testcases/open_hpi_testsuite/ssl/Makefile.in
	testcases/open_hpi_testsuite/utils/Makefile.in
	testcases/open_hpi_testsuite/utils/sahpi_enum_utils.c
	testcases/open_hpi_testsuite/utils/sahpi_enum_utils.h
	testcases/open_hpi_testsuite/utils/sahpi_struct_utils.c
	testcases/open_hpi_testsuite/utils/t/Makefile.in
	testcases/open_hpi_testsuite/utils/t/ann/Makefile.in
	testcases/open_hpi_testsuite/utils/t/el/Makefile.in
	testcases/open_hpi_testsuite/utils/t/epath/Makefile.in
	testcases/open_hpi_testsuite/utils/t/rpt/Makefile.in
	testcases/open_hpi_testsuite/utils/t/sahpi/Makefile.in
	testcases/open_hpi_testsuite/utils/t/sahpi/sahpi_struct_utils_test.c
	testcases/open_hpi_testsuite/utils/t/uid/Makefile.in