merge of '305437fef3e07f06f422c525af6d258fe65bd133'
authorJeremy Laine <jeremy.laine@m4x.org>
Wed, 11 Jun 2008 16:18:53 +0000 (16:18 +0000)
committerJeremy Laine <jeremy.laine@m4x.org>
Wed, 11 Jun 2008 16:18:53 +0000 (16:18 +0000)
commit6e705387fcfdb7b76d9dd7d1a25c9a60bd65c8d0
tree91bbb9fb8b8a9687734e9d93c021c008879eec3e
parent15719bd72b40b6f98827702934830cdac2c57131
parent57cdf6b7addae3ebc0f825343958ce8238c86be3
Merge ... '305437fef3e07f06f422c525af6d258fe65bd133'
     and '374794f574689cc1c361cad389b3b85f1ab2132d'