Merge commit '3f94dfa' into stable
authorLuke Dashjr <luke-jr+git@utopios.org>
Mon, 26 Sep 2011 19:37:57 +0000 (15:37 -0400)
committerLuke Dashjr <luke-jr+git@utopios.org>
Mon, 26 Sep 2011 19:37:57 +0000 (15:37 -0400)
1  2 
doc/build-unix.txt

Simple merge