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)
commit47addf3f710feee0fe1953cbb4845215200c544a
treeacf38015a030046873571e23e3da4b4dc7f1b8e8
parent0fc2aa7cc70704f97a7b641cc9c55ccec956ea1c
parentb17675881798de7fb8de19406bc456d6edd47775
Merge commit 'giskard/master'