Merge commit 'Dieterbe/experimental' into experimental
authoruranther <jwheaton@purdue.edu>
Sat, 4 Jul 2009 22:57:51 +0000 (18:57 -0400)
committeruranther <jwheaton@purdue.edu>
Sat, 4 Jul 2009 22:57:51 +0000 (18:57 -0400)

Trivial merge