Merge pull request #4 from xtuple/master

update stack
Merge pull request #5 from xtuple/master

update stack
Merge pull request #6 from xtuple/master

catching up
Incident #19130 - committing what i have so far
Merge pull request #7 from xtuple/master

catching up
merge

ranch '19130' into mergeheadache

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
Incident #19130 - some things added to customer orms
Merge pull request #219 from mikerodonnell89/19130

19130
Incident #19130 - fixed some variable names
Merge pull request #220 from mikerodonnell89/19130

Incident #19130 - fixed some variable names
Merge pull request #1 from xtuple/master

2013-01-25