Merge branch 'master' into itanic

Conflicts:
	database.h

Signed-off-by: Timo Kokkonen <timo.t.kokkonen@iki.fi>

diff --cc database.h
index 4e99ba7d9bff8d136cde0e1e7db769ac84913ce2,2877c882f6d91a6745aea0803979103f0fca62fd..949ccedcc9341fbd00b5222a7a48e05099535b71
--- 1/database.h
--- 2/database.h
+++ b/database.h
@@@ -454,11 -451,9 +454,11 @@@ static struct rrd_database network_rrd 
        .images         = network_images,
  };
  
- static struct rrd_database *all_rrds[] = {
 +#include "power_database.h"
 +
+ static struct rrd_database *default_rrds[] = {
        &cpumem_rrd,
 -      &systemp_rrd,
 +      &power_rrd,
        &network_rrd,
        0
  };