Merge branch 'experimental'
commitd2e7663c95847f05aeb7ad83e7e8884921f65023
authorJosef 'Jeff' Sipek <jeffpc@josefsipek.net>
Sun, 14 Dec 2008 09:50:37 +0000 (14 04:50 -0500)
committerJosef 'Jeff' Sipek <jeffpc@josefsipek.net>
Sun, 14 Dec 2008 09:50:37 +0000 (14 04:50 -0500)
tree0a84eeba7e66ccaafe80de4d1cecea29d6f146c2
parentece16753e8ad41bb189078d5d9ec7adcf99405de
parent102783407e5d2db0fe24493694dfca7d61a582ad
Merge branch 'experimental'

Conflicts:

guilt
guilt
guilt-header
guilt-new
guilt-push
guilt-series