Incorporate changes from googlecode#20
Merged
pjohnmeyer merged 30 commits intomasterfrom Jan 26, 2013
Merged
Commits
Commits on Jan 10, 2013
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed