Merge branch 'master' into new_eth
authorMatt Ettus <matt@ettus.com>
Fri, 4 Sep 2009 17:29:00 +0000 (10:29 -0700)
committerMatt Ettus <matt@ettus.com>
Fri, 4 Sep 2009 17:29:00 +0000 (10:29 -0700)

Trivial merge