From 27fb331a795d7c060b55098f8cad362446da0e32 Mon Sep 17 00:00:00 2001
From: Guilhem Lavaux <lavaux@illinois.edu>
Date: Wed, 2 Feb 2011 12:24:32 -0500
Subject: [PATCH] More fixup for averaging