Merge branch 'master' into network
authorMartin Vidner <mvidner@suse.cz>
Thu, 3 Sep 2009 14:18:29 +0000 (16:18 +0200)
committerMartin Vidner <mvidner@suse.cz>
Thu, 3 Sep 2009 14:18:29 +0000 (16:18 +0200)
commit8803835a367d15b1ece721f98ff901a9ab1fcf1f
tree3b790f5e965850864a2239b9f0b152385f0dcb47
parenta4b8781064323cbefe8f7ac2e0805a7f8815e1b4
parent0bba8966c29aade7f3b154e1c6a3cabf3f50ada5
Merge branch 'master' into network