Merge commit 'giskard/master'
authorBernie Innocenti <bernie@codewiz.org>
Mon, 8 Feb 2010 23:32:57 +0000 (18:32 -0500)
committerBernie Innocenti <bernie@codewiz.org>
Mon, 8 Feb 2010 23:32:57 +0000 (18:32 -0500)

Trivial merge