Merge commit 'giskard/master'
authorBernie Innocenti <bernie@codewiz.org>
Sun, 14 Mar 2010 21:59:25 +0000 (17:59 -0400)
committerBernie Innocenti <bernie@codewiz.org>
Sun, 14 Mar 2010 21:59:25 +0000 (17:59 -0400)

Trivial merge