Merge.
authorCarl Hetherington <cth@carlh.net>
Sun, 9 Dec 2012 21:37:08 +0000 (21:37 +0000)
committerCarl Hetherington <cth@carlh.net>
Sun, 9 Dec 2012 21:37:08 +0000 (21:37 +0000)
commitf9778e457adced00b6e94efd157feddf37776ebe
tree8d05218e1b38eb286a2509c34cccf20d338c8a2a
parent31c3f5161bd860dfa4d4b6e152c7b61e23f2189b
parent19ff62c3c501dc1e6a0bea2266f6155c8005146d
Merge.
builds/control-12.10