To other committers: Peter Avalos will be committing the patches himself. I've given him a well deserved commit bit. -Matt