~cloudbuilders/nova/os-simple-usage

Viewing all changes in revision 1481.

  • Committer: Vishvananda Ishaya
  • Date: 2011-09-01 00:01:19 UTC
  • mfrom: (1468.1.47 nova)
  • Revision ID: vishvananda@gmail.com-20110901000119-hrwvhihpotfn72a2
merge trunk, fix conflict

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: