Merge master.
authorCarl Hetherington <cth@carlh.net>
Sun, 7 Apr 2013 12:53:52 +0000 (13:53 +0100)
committerCarl Hetherington <cth@carlh.net>
Sun, 7 Apr 2013 12:53:52 +0000 (13:53 +0100)
commit5859b758e3a6e0191ce12e77b636c7def58bbc3b
treed1ed34a7a9ab2fdc2281b04f0bd470110477ccfc
parent263eee639546964aaa57f5d2d3b24008ecfe8adb
parent26a7e35765ae09606ce16365acd5d9a7f2876a3f
Merge master.
src/lib/util.cc
src/lib/wscript
wscript