merge of '175ebb8804e22098d4acb2270345622a09cb816f'
authorPhil Blundell <philb@gnu.org>
Sat, 26 Jul 2008 22:22:57 +0000 (22:22 +0000)
committerPhil Blundell <philb@gnu.org>
Sat, 26 Jul 2008 22:22:57 +0000 (22:22 +0000)
commitf42de04dcfeb7578aacf6b9a9375d83b2483f3b2
tree6d55ec1f20fbdbe9ab6a3687f5089a8d0a1ab44d
parent8ab04cdef8f58b141277ada408f726374fc7ff65
parent1fafecae1a951039dd5b1e2db93387716c117f8b
Merge ... '175ebb8804e22098d4acb2270345622a09cb816f'
     and '7509e3e8303bef27a2a18d113f7a08f6888fce33'