-Copyright 2003, 2004, 2005, 2006 Princeton University
+Copyright 2003, 2004, 2005, 2006, 2007, 2008 Princeton University
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions