Merge remote-tracking branch 'origin/master' into nifrek/duckanims
authornifrek <nifrek@gmail.com>
Tue, 20 Dec 2011 05:05:50 +0000 (00:05 -0500)
committernifrek <nifrek@gmail.com>
Tue, 20 Dec 2011 05:05:50 +0000 (00:05 -0500)

Trivial merge