Merge branch 'patch/disk_solaris' into release/5.2.1
Merge branch 'patch/fix_for_large_MaxPacketSize' into release/5.2.1
Merge branch 'patch/fix_interfaces_solaris' into release/5.2.1
Merge branch 'patch/logfile' into release/5.2.1
Merge branch 'patch/network_queuelength' into release/5.2.1
Merge branch 'patch/nfs_stats_with_network_plugin' into release/5.2.1
Merge branch 'patch/notification_forwarding' into release/5.2.1
Merge branch 'patch/perfwatcher_addons' into release/5.2.1
Merge branch 'patch/process' into release/5.2.1
Merge branch 'patch/protocols_solaris' into release/5.2.1

Conflicts:
	configure.in
Merge branch 'plugin/basic_aggregator' into release/5.2.1
Merge branch 'plugin/jsonrpc' into release/5.2.1

Conflicts:
	src/types.db
Merge branch 'plugin/notify_file' into release/5.2.1

Conflicts:
	configure.in
Merge branch 'plugin/rrdtool_createonly' into release/5.2.1
Merge branch 'plugin/sysconfig' into release/5.2.1
Merge branch 'plugin/top' into release/5.2.1

Conflicts:
	configure.in
Merge branch 'plugin/write_top' into release/5.2.1

Conflicts:
	configure.in
New release 5.2.1-20130311