merge
authorEmmanuel Ackaouy <ack@xensource.com>
Fri, 5 Jan 2007 17:46:14 +0000 (17:46 +0000)
committerEmmanuel Ackaouy <ack@xensource.com>
Fri, 5 Jan 2007 17:46:14 +0000 (17:46 +0000)

Trivial merge