Commit 58fb8ca2dfb89ad70284bb9678d3d4dbb658c8a7

Landon Fuller 2011-02-12T10:23:19

Merge remote branch 'upstream/master'