Merge branch 'master' into network
authorMartin Vidner <mvidner@suse.cz>
Fri, 11 Sep 2009 05:41:19 +0000 (07:41 +0200)
committerMartin Vidner <mvidner@suse.cz>
Fri, 11 Sep 2009 05:41:19 +0000 (07:41 +0200)
commitd8cc7079f8c49be13f3b5df354a8bd4d77a8cad5
treed48f92550c22378e40feeded2d918081176515bf
parent25ab523cd9d2337ab99e4d917e26c5ec767277dd
parent480044c704b5f5eb978b9947d0beee5b977574a7
Merge branch 'master' into network