Merge remote-tracking branch 'origin/master' into combined
authorrogerdpack <rogerpack2005@gmail.com>
Wed, 16 Jan 2013 02:09:15 +0000 (19:09 -0700)
committerrogerdpack <rogerpack2005@gmail.com>
Wed, 16 Jan 2013 02:09:15 +0000 (19:09 -0700)

Trivial merge