Merge remote branch 'sunjammer/master'
authorBernie Innocenti <bernie@codewiz.org>
Sun, 28 Feb 2010 15:26:18 +0000 (12:26 -0300)
committerBernie Innocenti <bernie@codewiz.org>
Sun, 28 Feb 2010 15:26:18 +0000 (12:26 -0300)

Trivial merge