Merge commit 'Dieterbe/experimental' into experimental
authoruranther <jwheaton@purdue.edu>
Fri, 10 Jul 2009 17:44:10 +0000 (13:44 -0400)
committeruranther <jwheaton@purdue.edu>
Fri, 10 Jul 2009 17:44:10 +0000 (13:44 -0400)

Trivial merge