Merge branch 'master' of ssh://sources.redhat.com/git/systemtap

Conflicts:

	ChangeLog

1 files changed, 3 insertions, 3 deletions

diff --git a/session.h b/session.h
index 9f38372f..e8100cf5 100644
--- a/session.h
+++ b/session.h
@@ -52,16 +52,16 @@ struct module_cache;
 struct statistic_decl
 {
   statistic_decl()
-    : type(none), 
+    : type(none),
       linear_low(0), linear_high(0), linear_step(0)
-  {}    
+  {}
   enum { none, linear, logarithmic } type;
   int64_t linear_low;
   int64_t linear_high;
   int64_t linear_step;
   bool operator==(statistic_decl const & other)
   {
-    return type == other.type 
+    return type == other.type
       && linear_low == other.linear_low
       && linear_high == other.linear_high
       && linear_step == other.linear_step;