[openstack-nova/f17: 2/2] Merge branch 'master' into f17

[Pádraig Brady]

commit 08da593ec4d4db227b6a99e4268dcefd88e8b6f1
Merge: 1e6b2e8 00978a3
Author: Pádraig Brady <P at draigBrady.com>
Date:   Tue Apr 17 23:54:15 2012 +0100

    Merge branch 'master' into f17

 openstack-nova-ajax-console-proxy.service |   12 ------------
 1 files changed, 0 insertions(+), 12 deletions(-)
---